mirror of
https://github.com/mangosfour/server.git
synced 2026-01-01 07:37:07 +00:00
Just merge commit 'origin/master' into 320
Conflicts: src/game/MiscHandler.cpp
This commit is contained in:
commit
be8eaf4e46
33 changed files with 1089 additions and 863 deletions
|
|
@ -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'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue