diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-01-26 00:12:51 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-01-26 00:12:51 +0100 |
| commit | 3f66a1934942adf3f4e81f49fe3c18476aed0177 (patch) | |
| tree | e31c4ebe3849271dfb46223322cb883ac4f1bce0 /src | |
| parent | 760184661da4b96cc390ceb161646c8a83712acf (diff) | |
| download | mana-3f66a1934942adf3f4e81f49fe3c18476aed0177.tar.gz mana-3f66a1934942adf3f4e81f49fe3c18476aed0177.tar.bz2 mana-3f66a1934942adf3f4e81f49fe3c18476aed0177.tar.xz mana-3f66a1934942adf3f4e81f49fe3c18476aed0177.zip | |
Prune the enet and manaserv files dependency of the 0.5 binary.
Only using cmake conditions and an ifdef. This will greatly help
packaging the mana 0.5 version on other distros.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 21 | ||||
| -rw-r--r-- | src/net/net.cpp | 3 |
2 files changed, 18 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c9f23cc1..0fd32f59 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -22,11 +22,14 @@ IF (CMAKE_COMPILER_IS_GNUCXX) ENDIF() IF (POLICY CMP0015) - CMAKE_POLICY(SET CMP0015 OLD) + CMAKE_POLICY(SET CMP0015 OLD) +ENDIF() + +IF (ENABLE_MANASERV) + INCLUDE_DIRECTORIES("../libs/enet/include") + LINK_DIRECTORIES("../libs/enet") + SET(INTERNAL_LIBRARIES enet) ENDIF() -INCLUDE_DIRECTORIES("../libs/enet/include") -LINK_DIRECTORIES("../libs/enet") -SET(INTERNAL_LIBRARIES enet) SET(FLAGS "-DPACKAGE_VERSION=\\\"${VERSION}\\\"") SET(FLAGS "${FLAGS} -DPKG_DATADIR=\\\"${PKG_DATADIR}/\\\"") @@ -36,6 +39,10 @@ IF (ENABLE_NLS) SET(FLAGS "${FLAGS} -DENABLE_NLS=1") ENDIF() +IF (ENABLE_MANASERV) + SET(FLAGS "${FLAGS} -DMANASERV_SUPPORT=1") +ENDIF() + IF (CMAKE_BUILD_TYPE) STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) IF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug OR @@ -623,7 +630,11 @@ ENDIF () SET (PROGRAMS mana) -ADD_EXECUTABLE(mana WIN32 ${SRCS} ${SRCS_MANA} ${SRCS_TMWA}) +IF (ENABLE_MANASERV) + ADD_EXECUTABLE(mana WIN32 ${SRCS} ${SRCS_MANA} ${SRCS_TMWA}) +ELSE(ENABLE_MANASERV) + ADD_EXECUTABLE(mana WIN32 ${SRCS} ${SRCS_TMWA}) +ENDIF(ENABLE_MANASERV) TARGET_LINK_LIBRARIES(mana ${INTERNAL_LIBRARIES} diff --git a/src/net/net.cpp b/src/net/net.cpp index 25dcd981..1b4bbf36 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -159,10 +159,11 @@ void connectToServer(ServerInfo &server) switch (server.type) { +#ifdef MANASERV_SUPPORT case ServerInfo::MANASERV: new ManaServ::GeneralHandler; break; - +#endif case ServerInfo::TMWATHENA: new TmwAthena::GeneralHandler; break; |