diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-08-19 19:53:28 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-08-19 19:53:28 +0300 |
| commit | bd5ebdedb78b145120affe161d91389ac27e71ef (patch) | |
| tree | 0187a44219d4a0d2f94ee9270e6a9499cad772cf | |
| parent | b5398a7046123e8cc13ebe7da8fb7ccc80885c7d (diff) | |
| download | mv-bd5ebdedb78b145120affe161d91389ac27e71ef.tar.gz mv-bd5ebdedb78b145120affe161d91389ac27e71ef.tar.bz2 mv-bd5ebdedb78b145120affe161d91389ac27e71ef.tar.xz mv-bd5ebdedb78b145120affe161d91389ac27e71ef.zip | |
Use socialguildtab2.h only if tmwa compilation enabled.
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gui/windows/socialwindow.cpp | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a5ddd9766..9a4a0f381 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -290,7 +290,6 @@ SET(SRCS gui/widgets/tabs/socialfriendsfunctor.h gui/widgets/tabs/socialfriendstab.h gui/widgets/tabs/socialguildtab.h - gui/widgets/tabs/socialguildtab2.h gui/widgets/tabs/socialnavigationtab.h gui/widgets/tabs/socialpartytab.h gui/widgets/tabs/socialpickuptab.h @@ -1941,6 +1940,7 @@ SET(SRCS_TMWA net/tmwa/searchstorehandler.h net/tmwa/vendinghandler.cpp net/tmwa/vendinghandler.h + gui/widgets/tabs/socialguildtab2.h ) IF (WIN32) diff --git a/src/Makefile.am b/src/Makefile.am index 957ac0b57..62ab9e295 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1059,7 +1059,6 @@ manaplus_SOURCES += main.cpp \ gui/widgets/tabs/socialfriendsfunctor.h \ gui/widgets/tabs/socialfriendstab.h \ gui/widgets/tabs/socialguildtab.h \ - gui/widgets/tabs/socialguildtab2.h \ gui/widgets/tabs/socialnavigationtab.h \ gui/widgets/tabs/socialpartytab.h \ gui/widgets/tabs/socialpickuptab.h \ @@ -1471,6 +1470,7 @@ manaplus_CXXFLAGS += -DTMWA_SUPPORT manaplus_SOURCES += \ enums/magicschool.h \ gui/models/magicschoolmodel.h \ + gui/widgets/tabs/socialguildtab2.h \ gui/widgets/tabs/chat/emulateguildtab.cpp \ gui/widgets/tabs/chat/emulateguildtab.h \ gui/windows/shopselldialog.cpp \ diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index 32f44b511..055b19ed8 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -32,13 +32,14 @@ #include "gui/widgets/tabs/socialattacktab.h" #include "gui/widgets/tabs/socialfriendstab.h" #include "gui/widgets/tabs/socialguildtab.h" -#include "gui/widgets/tabs/socialguildtab2.h" #include "gui/widgets/tabs/socialnavigationtab.h" #include "gui/widgets/tabs/socialpartytab.h" #include "gui/widgets/tabs/socialpickuptab.h" #include "gui/widgets/tabs/socialplayerstab.h" #ifdef TMWA_SUPPORT +#include "gui/widgets/tabs/socialguildtab2.h" + #include "net/tmwa/guildmanager.h" #endif @@ -183,11 +184,13 @@ bool SocialWindow::addTab(Guild *const guild) tab = new SocialGuildTab(this, guild, getOptionBool("showtabbackground")); } +#ifdef TMWA_SUPPORT else { tab = new SocialGuildTab2(this, guild, getOptionBool("showtabbackground")); } +#endif // TMWA_SUPPORT mGuilds[guild] = tab; mTabs->addTab(tab, tab->mScroll); |