summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-27 00:25:45 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-27 00:25:45 +0300
commit2327e221128fb7c0b4a46cb71cf2cff8f3772654 (patch)
treebec78d2dbf786c7705ac49bc08300b8c0717c5cf
parent6a5aad6c537322ac5b54cde85271a560579d17ca (diff)
downloadmv-2327e221128fb7c0b4a46cb71cf2cff8f3772654.tar.gz
mv-2327e221128fb7c0b4a46cb71cf2cff8f3772654.tar.bz2
mv-2327e221128fb7c0b4a46cb71cf2cff8f3772654.tar.xz
mv-2327e221128fb7c0b4a46cb71cf2cff8f3772654.zip
Build bankhandler only if eathena enabled.
-rw-r--r--src/CMakeLists.txt6
-rw-r--r--src/Makefile.am6
-rw-r--r--src/net/bankhandler.h3
-rw-r--r--src/net/tmwa/bankhandler.h3
4 files changed, 12 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 215d79a33..1167ba997 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -521,7 +521,6 @@ SET(SRCS
gui/windows/worldselectdialog.cpp
gui/windows/worldselectdialog.h
net/adminhandler.h
- net/bankhandler.h
net/character.h
net/charserverhandler.cpp
net/charserverhandler.h
@@ -1321,8 +1320,6 @@ SET(SRCS_TMWA
gui/windows/shopselldialog.h
net/tmwa/adminhandler.cpp
net/tmwa/adminhandler.h
- net/tmwa/bankhandler.cpp
- net/tmwa/bankhandler.h
net/tmwa/cashshophandler.cpp
net/tmwa/cashshophandler.h
net/tmwa/beinghandler.cpp
@@ -1416,8 +1413,11 @@ SET(SRCS_EATHENA
listeners/vendingslotslistener.cpp
listeners/vendingslotslistener.h
net/auctionhandler.h
+ net/bankhandler.h
net/tmwa/auctionhandler.cpp
net/tmwa/auctionhandler.h
+ net/tmwa/bankhandler.cpp
+ net/tmwa/bankhandler.h
net/eathena/adminhandler.cpp
net/eathena/adminhandler.h
net/eathena/auctionhandler.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 3578a0d11..b8046e64b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -645,7 +645,6 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/windows/worldselectdialog.cpp \
gui/windows/worldselectdialog.h \
net/adminhandler.h \
- net/bankhandler.h \
net/cashshophandler.h \
net/beinghandler.h \
net/buyingstorehandler.h \
@@ -1256,8 +1255,6 @@ manaplus_SOURCES += \
gui/windows/shopselldialog.h \
net/tmwa/adminhandler.cpp \
net/tmwa/adminhandler.h \
- net/tmwa/bankhandler.cpp \
- net/tmwa/bankhandler.h \
net/tmwa/cashshophandler.cpp \
net/tmwa/cashshophandler.h \
net/tmwa/beinghandler.cpp \
@@ -1352,8 +1349,11 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \
listeners/vendingslotslistener.cpp \
listeners/vendingslotslistener.h \
net/auctionhandler.h \
+ net/bankhandler.h \
net/tmwa/auctionhandler.cpp \
net/tmwa/auctionhandler.h \
+ net/tmwa/bankhandler.cpp \
+ net/tmwa/bankhandler.h \
net/eathena/adminhandler.cpp \
net/eathena/adminhandler.h \
net/eathena/auctionhandler.cpp \
diff --git a/src/net/bankhandler.h b/src/net/bankhandler.h
index dc7f4dc95..974d73147 100644
--- a/src/net/bankhandler.h
+++ b/src/net/bankhandler.h
@@ -21,6 +21,8 @@
#ifndef NET_BANKHANDLER_H
#define NET_BANKHANDLER_H
+#ifdef EATHENA_SUPPORT
+
#include <string>
#include "localconsts.h"
@@ -45,4 +47,5 @@ class BankHandler notfinal
extern Net::BankHandler *bankHandler;
+#endif // EATHENA_SUPPORT
#endif // NET_BANKHANDLER_H
diff --git a/src/net/tmwa/bankhandler.h b/src/net/tmwa/bankhandler.h
index 650d94822..6b3c9e505 100644
--- a/src/net/tmwa/bankhandler.h
+++ b/src/net/tmwa/bankhandler.h
@@ -21,6 +21,8 @@
#ifndef NET_TMWA_BANKHANDLER_H
#define NET_TMWA_BANKHANDLER_H
+#ifdef EATHENA_SUPPORT
+
#include "net/bankhandler.h"
#include "net/tmwa/messagehandler.h"
@@ -47,4 +49,5 @@ class BankHandler final : public MessageHandler,
} // namespace TmwAthena
+#endif // EATHENA_SUPPORT
#endif // NET_TMWA_BANKHANDLER_H