diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-02-27 00:37:57 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-02-27 01:51:18 +0300 |
| commit | ccd272519ec38b15fa5ec24fe4c6daa6eb45e3da (patch) | |
| tree | 863537991d40a9665191ad9cbf69df81112d2b0a | |
| parent | 5b9f5605671f09849e1bc59fa862e2e7e9b9e0a8 (diff) | |
| download | mv-ccd272519ec38b15fa5ec24fe4c6daa6eb45e3da.tar.gz mv-ccd272519ec38b15fa5ec24fe4c6daa6eb45e3da.tar.bz2 mv-ccd272519ec38b15fa5ec24fe4c6daa6eb45e3da.tar.xz mv-ccd272519ec38b15fa5ec24fe4c6daa6eb45e3da.zip | |
Fix compilation for eathena only.
| -rw-r--r-- | src/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | src/Makefile.am | 15 |
2 files changed, 24 insertions, 13 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 99bd0a3ab..ef6ecdb6a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1389,6 +1389,15 @@ SET(SRCS_TMWA net/tmwa/vendinghandler.h ) +SET(SRCS_TMWAEATHENA + net/tmwa/auctionhandler.cpp + net/tmwa/auctionhandler.h + net/tmwa/bankhandler.cpp + net/tmwa/bankhandler.h + net/tmwa/buyingstorehandler.cpp + net/tmwa/buyingstorehandler.h + ) + SET(SRCS_EATHENA gui/windows/bankwindow.cpp gui/windows/bankwindow.h @@ -1413,12 +1422,6 @@ SET(SRCS_EATHENA net/auctionhandler.h net/bankhandler.h net/buyingstorehandler.h - net/tmwa/auctionhandler.cpp - net/tmwa/auctionhandler.h - net/tmwa/bankhandler.cpp - net/tmwa/bankhandler.h - net/tmwa/buyingstorehandler.cpp - net/tmwa/buyingstorehandler.h net/eathena/adminhandler.cpp net/eathena/adminhandler.h net/eathena/auctionhandler.cpp @@ -1519,11 +1522,16 @@ ENDIF () SET (PROGRAMS manaplus dyecmd) IF (ENABLE_EATHENA) +IF (ENABLE_TMWA) + SET(SRCS ${SRCS} ${SRCS_EATHENA} ${SRCS_TMWA} ${SRCS_TMWAEATHENA}) +ELSE SET(SRCS ${SRCS} ${SRCS_EATHENA}) -ENDIF(ENABLE_EATHENA) +ENDIF(ENABLE_TMWA) +ELSE IF (ENABLE_TMWA) SET(SRCS ${SRCS} ${SRCS_TMWA}) ENDIF(ENABLE_TMWA) +ENDIF(ENABLE_EATHENA) ADD_EXECUTABLE(manaplus WIN32 ${SRCS} ${SRCS_EVOL}) ADD_EXECUTABLE(dyecmd WIN32 ${DYE_CMD_SRCS}) diff --git a/src/Makefile.am b/src/Makefile.am index 80d4128c5..289aa0116 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1324,6 +1324,15 @@ manaplus_SOURCES += \ endif if ENABLE_EATHENA +if ENABLE_TMWA +manaplus_SOURCES += net/tmwa/auctionhandler.cpp \ + net/tmwa/auctionhandler.h \ + net/tmwa/bankhandler.cpp \ + net/tmwa/bankhandler.h \ + net/tmwa/buyingstorehandler.cpp \ + net/tmwa/buyingstorehandler.h +endif + manaplus_CXXFLAGS += -DEATHENA_SUPPORT manaplus_SOURCES += gui/windows/bankwindow.cpp \ gui/windows/bankwindow.h \ @@ -1348,12 +1357,6 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \ net/auctionhandler.h \ net/bankhandler.h \ net/buyingstorehandler.h \ - net/tmwa/auctionhandler.cpp \ - net/tmwa/auctionhandler.h \ - net/tmwa/bankhandler.cpp \ - net/tmwa/bankhandler.h \ - net/tmwa/buyingstorehandler.cpp \ - net/tmwa/buyingstorehandler.h \ net/eathena/adminhandler.cpp \ net/eathena/adminhandler.h \ net/eathena/auctionhandler.cpp \ |