summaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorDaniel Bradshaw <daniel+commits@the-cell.co.uk>2010-01-31 13:14:07 +0000
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-01-31 17:50:29 +0100
commit2ff6ad2e8a67bd8ef34b56b866ef277c30135f19 (patch)
tree536497f63044441a6e8032209446d1c3213b9d55 /src/Makefile.am
parent22c75a346e029fad746b6aa0b123c886ddeb5c75 (diff)
downloadmana-2ff6ad2e8a67bd8ef34b56b866ef277c30135f19.tar.gz
mana-2ff6ad2e8a67bd8ef34b56b866ef277c30135f19.tar.bz2
mana-2ff6ad2e8a67bd8ef34b56b866ef277c30135f19.tar.xz
mana-2ff6ad2e8a67bd8ef34b56b866ef277c30135f19.zip
Unify eAthena and manaserv support in to one build.
Finish support for server types in the server dialog. Using the new server type function, strip out ifdefs, replacing them with if blocks for later merging in smaller atomic commits. Remove any remaining references to the support defs, including in build system.
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 7e7fe415..1a18402c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -394,8 +394,6 @@ mana_SOURCES = gui/widgets/avatar.cpp \
vector.cpp \
vector.h
-if SERVER_MANASERV
-mana_CXXFLAGS += -DMANASERV_SUPPORT
mana_SOURCES += \
net/manaserv/adminhandler.cpp \
net/manaserv/adminhandler.h \
@@ -444,10 +442,7 @@ mana_SOURCES += \
net/manaserv/specialhandler.h \
net/manaserv/tradehandler.cpp \
net/manaserv/tradehandler.h
-endif
-if SERVER_EATHENA
-mana_CXXFLAGS += -DEATHENA_SUPPORT
mana_SOURCES += \
net/ea/gui/partytab.cpp \
net/ea/gui/partytab.h \
@@ -492,7 +487,6 @@ mana_SOURCES += \
net/ea/specialhandler.h \
net/ea/tradehandler.cpp \
net/ea/tradehandler.h
-endif
# set the include path found by configure
INCLUDES = $(all_includes)