mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-28 13:37:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Just merge commit 'origin/master' into 320

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

10
src/game/Makefile.am
View file

@ -82,6 +82,7 @@ libmangosgame_a_SOURCES = \
Channel.cpp \
Channel.h \
ChannelHandler.cpp \
ChannelMgr.cpp \
ChannelMgr.h \
CharacterHandler.cpp \
Chat.cpp \
@ -298,10 +299,15 @@ libmangosgame_a_SOURCES = \
GroupRefManager.h
## Link against shared library
libmangosgame_a_LIBADD = ../shared/libmangosshared.a ../shared/Auth/libmangosauth.a ../shared/Config/libmangosconfig.a ../shared/Database/libmangosdatabase.a ../shared/vmap/libmangosvmaps.a
libmangosgame_a_LIBADD = \
../shared/libmangosshared.a \
../shared/Auth/libmangosauth.a \
../shared/Config/libmangosconfig.a \
../shared/Database/libmangosdatabase.a \
../shared/vmap/libmangosvmaps.a
## Additional files to include when running 'make dist'
# Precompiled Headers for WIN
EXTRA_DIST = \
pchdef.cpp \
pchdef.h
pchdef.h