Just merge commit 'origin/master' into 320

Conflicts:
	src/game/MiscHandler.cpp
This commit is contained in:
tomrus88 2009-07-28 17:05:38 +04:00
commit be8eaf4e46
33 changed files with 1089 additions and 863 deletions

View file

@ -30,7 +30,14 @@ mangos_realmd_SOURCES = \
RealmList.h
## Link realm list daemon against the shared library
mangos_realmd_LDADD = ../shared/Database/libmangosdatabase.a ../shared/Config/libmangosconfig.a ../shared/Auth/libmangosauth.a ../shared/libmangosshared.a ../framework/libmangosframework.a ../../dep/src/sockets/libmangossockets.a
mangos_realmd_LDADD = \
../shared/Database/libmangosdatabase.a \
../shared/Config/libmangosconfig.a \
../shared/Auth/libmangosauth.a \
../shared/libmangosshared.a \
../framework/libmangosframework.a \
../../dep/src/sockets/libmangossockets.a
mangos_realmd_LDFLAGS = -L../../dep/src/sockets -L$(libdir) $(MANGOS_LIBS)
## Additional files to include when running 'make dist'