diff options
| author | Daniel Bradshaw <daniel+commits@the-cell.co.uk> | 2010-01-31 13:14:07 +0000 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-01-31 17:50:29 +0100 |
| commit | 2ff6ad2e8a67bd8ef34b56b866ef277c30135f19 (patch) | |
| tree | 536497f63044441a6e8032209446d1c3213b9d55 /src/CMakeLists.txt | |
| parent | 22c75a346e029fad746b6aa0b123c886ddeb5c75 (diff) | |
| download | mana-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/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6b401967..68d7b064 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -589,10 +589,10 @@ IF (WIN32) SET(SRCS_EA ${SRCS_EA} mana-ea.rc) ENDIF () -SET (PROGRAMS mana mana-ea) +SET (PROGRAMS mana) -ADD_EXECUTABLE(mana WIN32 ${SRCS} ${SRCS_MANA}) -ADD_EXECUTABLE(mana-ea WIN32 ${SRCS} ${SRCS_EA}) +ADD_EXECUTABLE(mana WIN32 ${SRCS} ${SRCS_MANA} ${SRCS_EA}) +#ADD_EXECUTABLE(mana-ea WIN32 ${SRCS} ${SRCS_EA}) FOREACH(program ${PROGRAMS}) TARGET_LINK_LIBRARIES(${program} ${SDL_LIBRARY} @@ -612,15 +612,12 @@ FOREACH(program ${PROGRAMS}) INSTALL(TARGETS ${program} RUNTIME DESTINATION ${PKG_BINDIR}) ENDFOREACH(program) -SET(FLAGS_EA "${FLAGS} -DEATHENA_SUPPORT") -SET(FLAGS_MANA "${FLAGS} -DMANASERV_SUPPORT") - IF (CMAKE_SYSTEM_NAME STREQUAL SunOS) # we expect the SMCgtxt package to be present on Solaris; # the Solaris gettext is not API-compatible to GNU gettext SET_TARGET_PROPERTIES(mana PROPERTIES LINK_FLAGS "-L/usr/local/lib") - SET_TARGET_PROPERTIES(mana-ea PROPERTIES LINK_FLAGS "-L/usr/local/lib") + #SET_TARGET_PROPERTIES(mana-ea PROPERTIES LINK_FLAGS "-L/usr/local/lib") ENDIF() SET_TARGET_PROPERTIES(mana PROPERTIES COMPILE_FLAGS "${FLAGS_MANA}") -SET_TARGET_PROPERTIES(mana-ea PROPERTIES COMPILE_FLAGS "${FLAGS_EA}") +#SET_TARGET_PROPERTIES(mana-ea PROPERTIES COMPILE_FLAGS "${FLAGS_EA}") |