Build familyhandler only if eathena enabled.

8 files changed, 18 insertions, 12 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e416c0b01..3b3f7acea 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1327,8 +1327,6 @@ SET(SRCS_TMWA
     net/tmwa/charserverhandler.h
     net/tmwa/chathandler.cpp
     net/tmwa/chathandler.h
-    net/tmwa/familyhandler.cpp
-    net/tmwa/familyhandler.h
     net/tmwa/friendshandler.cpp
     net/tmwa/friendshandler.h
     net/tmwa/gamehandler.cpp
@@ -1395,6 +1393,8 @@ SET(SRCS_TMWAEATHENA
     net/tmwa/cashshophandler.h
     net/tmwa/elementalhandler.cpp
     net/tmwa/elementalhandler.h
+    net/tmwa/familyhandler.cpp
+    net/tmwa/familyhandler.h
     )
 
 SET(SRCS_EATHENA
@@ -1423,6 +1423,7 @@ SET(SRCS_EATHENA
     net/buyingstorehandler.h
     net/cashshophandler.h
     net/elementalhandler.h
+    net/familyhandler.h
     net/eathena/adminhandler.cpp
     net/eathena/adminhandler.h
     net/eathena/auctionhandler.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index dfc70ca90..8273abf56 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -651,7 +651,6 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      net/charserverhandler.cpp \
 	      net/charserverhandler.h \
 	      net/chathandler.h \
-	      net/familyhandler.h \
 	      net/friendshandler.h \
 	      net/download.cpp \
 	      net/download.h \
@@ -1260,8 +1259,6 @@ manaplus_SOURCES += \
 	      net/tmwa/charserverhandler.h \
 	      net/tmwa/chathandler.cpp \
 	      net/tmwa/chathandler.h \
-	      net/tmwa/familyhandler.cpp \
-	      net/tmwa/familyhandler.h \
 	      net/tmwa/friendshandler.cpp \
 	      net/tmwa/friendshandler.h \
 	      net/tmwa/gamehandler.cpp \
@@ -1328,7 +1325,9 @@ manaplus_SOURCES += net/tmwa/auctionhandler.cpp \
 	      net/tmwa/cashshophandler.cpp \
 	      net/tmwa/cashshophandler.h \
 	      net/tmwa/elementalhandler.cpp \
-	      net/tmwa/elementalhandler.h
+	      net/tmwa/elementalhandler.h \
+	      net/tmwa/familyhandler.cpp \
+	      net/tmwa/familyhandler.h
 endif
 
 manaplus_CXXFLAGS += -DEATHENA_SUPPORT
@@ -1357,6 +1356,7 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \
 	      net/buyingstorehandler.h \
 	      net/cashshophandler.h \
 	      net/elementalhandler.h \
+	      net/familyhandler.h \
 	      net/eathena/adminhandler.cpp \
 	      net/eathena/adminhandler.h \
 	      net/eathena/auctionhandler.cpp \
diff --git a/src/net/familyhandler.h b/src/net/familyhandler.h
index cbb8451ad..df151560e 100644
--- a/src/net/familyhandler.h
+++ b/src/net/familyhandler.h
@@ -21,6 +21,8 @@
 #ifndef NET_FAMILYHANDLER_H
 #define NET_FAMILYHANDLER_H
 
+#ifdef EATHENA_SUPPORT
+
 #include <string>
 
 #include "localconsts.h"
@@ -45,4 +47,5 @@ class FamilyHandler notfinal
 
 extern Net::FamilyHandler *familyHandler;
 
+#endif  // EATHENA_SUPPORT
 #endif  // NET_FAMILYHANDLER_H
diff --git a/src/net/net.cpp b/src/net/net.cpp
index e421bfe1a..3b86526cb 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -46,13 +46,13 @@ namespace Net
     class BuyingStoreHandler;
     class CashShopHandler;
     class ElementalHandler;
+    class FamilyHandler;
 #endif
     class AdminHandler;
     class BeingHandler;
     class BuySellHandler;
     class CharServerHandler;
     class ChatHandler;
-    class FamilyHandler;
     class FriendsHandler;
     class GameHandler;
     class GeneralHandler;
@@ -99,8 +99,8 @@ Net::BankHandler *bankHandler = nullptr;
 Net::BuyingStoreHandler *buyingStoreHandler = nullptr;
 Net::CashShopHandler *cashShopHandler = nullptr;
 Net::ElementalHandler *elementalHandler = nullptr;
-#endif
 Net::FamilyHandler *familyHandler = nullptr;
+#endif
 Net::QuestHandler *questHandler = nullptr;
 Net::HomunculusHandler *homunculusHandler = nullptr;
 Net::FriendsHandler *friendsHandler = nullptr;
diff --git a/src/net/tmwa/auctionhandler.h b/src/net/tmwa/auctionhandler.h
index 01e1428d7..0cc72f184 100644
--- a/src/net/tmwa/auctionhandler.h
+++ b/src/net/tmwa/auctionhandler.h
@@ -29,7 +29,6 @@
 
 namespace TmwAthena
 {
-
 class AuctionHandler final : public MessageHandler, public Net::AuctionHandler
 {
     public:
diff --git a/src/net/tmwa/familyhandler.h b/src/net/tmwa/familyhandler.h
index 56e5d9873..e284312b9 100644
--- a/src/net/tmwa/familyhandler.h
+++ b/src/net/tmwa/familyhandler.h
@@ -21,6 +21,8 @@
 #ifndef NET_TMWA_FAMILYHANDLER_H
 #define NET_TMWA_FAMILYHANDLER_H
 
+#ifdef EATHENA_SUPPORT
+
 #include "net/familyhandler.h"
 
 #include "net/tmwa/messagehandler.h"
@@ -45,4 +47,5 @@ class FamilyHandler final : public MessageHandler,
 
 }  // namespace TmwAthena
 
+#endif  // EATHENA_SUPPORT
 #endif  // NET_TMWA_FAMILYHANDLER_H
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index bf36f1fc3..7008a70f8 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -112,8 +112,8 @@ GeneralHandler::GeneralHandler() :
     mBuyingStoreHandler(new BuyingStoreHandler),
     mCashShopHandler(new CashShopHandler),
     mElementalHandler(new ElementalHandler),
-#endif
     mFamilyHandler(new FamilyHandler),
+#endif
     mMercenaryHandler(new MercenaryHandler),
     mHomunculusHandler(new HomunculusHandler),
     mFriendsHandler(new FriendsHandler),
@@ -242,8 +242,8 @@ void GeneralHandler::load()
     mNetwork->registerHandler(mBuyingStoreHandler);
     mNetwork->registerHandler(mCashShopHandler);
     mNetwork->registerHandler(mElementalHandler);
-#endif
     mNetwork->registerHandler(mFamilyHandler);
+#endif
     mNetwork->registerHandler(mMercenaryHandler);
     mNetwork->registerHandler(mHomunculusHandler);
     mNetwork->registerHandler(mFriendsHandler);
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index 08ef109a9..7f4d4793c 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -88,8 +88,8 @@ class GeneralHandler final : public MessageHandler,
         MessageHandlerPtr mBuyingStoreHandler;
         MessageHandlerPtr mCashShopHandler;
         MessageHandlerPtr mElementalHandler;
-#endif
         MessageHandlerPtr mFamilyHandler;
+#endif
         MessageHandlerPtr mMercenaryHandler;
         MessageHandlerPtr mHomunculusHandler;
         MessageHandlerPtr mFriendsHandler;