diff options
| -rwxr-xr-x | configure.ac | 22 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 7 | ||||
| -rw-r--r-- | src/being/being.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/container.h | 4 | ||||
| -rw-r--r-- | src/gui/widgets/window.cpp | 5 | ||||
| -rw-r--r-- | src/localconsts.h | 7 |
7 files changed, 1 insertions, 48 deletions
diff --git a/configure.ac b/configure.ac index 839f59080..7700432fe 100755 --- a/configure.ac +++ b/configure.ac @@ -249,28 +249,6 @@ else fi AM_CONDITIONAL(USE_OPENGL, test x$with_opengl = xyes) -# Option to enable internal guichan -AC_ARG_WITH(internalguichan,[ --without-internalguichan DEPRICATED. don't use internal guichan ] ) -if test "x$with_internalguichan" == "xno"; then - with_internalguichan=no - - AC_CHECK_LIB([guichan], [gcnGuichanVersion], , - AC_MSG_ERROR([ *** Unable to find Guichan library (http://guichan.sf.net/)])) - AC_CHECK_HEADERS([guichan.hpp], , - AC_MSG_ERROR([ *** Guichan library found but cannot find headers (http://guichan.sf.net/)])) - - AC_CHECK_HEADERS([guichan/widgetlistener.hpp], , - AC_MSG_ERROR([ *** Guichan library version is found but version is < 0.8.0 (http://guichan.sf.net/)])) - - AC_CHECK_LIB([guichan_sdl], [gcnSDL], , - AC_MSG_ERROR([ *** Unable to find Guichan SDL library (http://guichan.sf.net/)])) - -else - with_internalguichan=yes - AC_DEFINE(USE_INTERNALGUICHAN, 1, [Defines if ManaPlus should use internal guichan classes]) -fi -AM_CONDITIONAL(USE_INTERNALGUICHAN, test x$with_internalguichan = xyes) - # Option to enable mumble support AC_ARG_WITH(mumble,[ --without-mumble don't use mumble integration ] ) if test "x$with_mumble" == "xno"; then diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 29e5afcb0..fafeeaf5d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -47,7 +47,7 @@ ELSEIF (CMAKE_SYSTEM_NAME STREQUAL Linux) SET(EXTRA_LIBRARIES rt) ENDIF() -SET(FLAGS "${FLAGS} -DUSE_MUMBLE -DUSE_INTERNALGUICHAN") +SET(FLAGS "${FLAGS} -DUSE_MUMBLE") IF (WITH_OPENGL) FIND_PACKAGE(OpenGL REQUIRED) diff --git a/src/Makefile.am b/src/Makefile.am index 7fb4541a1..0c50b6da5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,6 @@ else manaplus_SOURCES = endif -if USE_INTERNALGUICHAN dyecmd_CXXFLAGS = -I$(srcdir)/guichan/include -DUSE_INTERNALGUICHAN dyecmd_SOURCES = guichan/actionevent.cpp \ guichan/cliprectangle.cpp \ @@ -45,10 +44,6 @@ dyecmd_SOURCES = guichan/actionevent.cpp \ guichan/include/guichan/graphics.hpp \ guichan/include/guichan/rectangle.hpp \ guichan/include/guichan/widget.hpp -else -dyecmd_CXXFLAGS = -dyecmd_SOURCES = -endif dyecmd_SOURCES += dyetool/dyemain.cpp \ animatedsprite.cpp \ @@ -163,7 +158,6 @@ manaplus_CXXFLAGS += -DUSE_SDL2 endif endif -if USE_INTERNALGUICHAN manaplus_CXXFLAGS += -I$(srcdir)/guichan/include -DUSE_INTERNALGUICHAN manaplus_SOURCES += guichan/include/guichan/actionevent.hpp \ guichan/include/guichan/actionlistener.hpp \ @@ -238,7 +232,6 @@ manaplus_SOURCES += guichan/actionevent.cpp \ guichan/widgets/textbox.cpp \ guichan/widgets/textfield.cpp \ guichan/widgets/window.cpp -endif manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/avatarlistbox.h \ diff --git a/src/being/being.cpp b/src/being/being.cpp index fef3ca53a..dfb335f9b 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -1847,9 +1847,7 @@ void Being::drawSpeech(const int offsetX, const int offsetY) mSpeechBubble->setPosition(px - (mSpeechBubble->getWidth() / 2), py - getHeight() - (mSpeechBubble->getHeight())); mSpeechBubble->setVisible(true); -#ifdef USE_INTERNALGUICHAN mSpeechBubble->requestMoveToBackground(); -#endif } else if (mSpeechTime > 0 && speech == TEXT_OVERHEAD) { diff --git a/src/gui/widgets/container.h b/src/gui/widgets/container.h index 2983a7433..8f3933357 100644 --- a/src/gui/widgets/container.h +++ b/src/gui/widgets/container.h @@ -27,10 +27,6 @@ #include <guichan/widgets/container.hpp> -#if !defined USE_INTERNALGUICHAN -typedef std::list<gcn::Widget *>::const_iterator WidgetListConstIterator; -#endif - /** * A widget container. * diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index 36372dcaa..c716445f3 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -92,11 +92,6 @@ Window::Window(const std::string &caption, const bool modal, { logger->log("Window::Window(\"%s\")", caption.c_str()); -#ifndef USE_INTERNALGUICHAN - mDragOffsetX = 0; - mDragOffsetY = 0; -#endif - if (!windowContainer) throw GCN_EXCEPTION("Window::Window(): no windowContainer set"); diff --git a/src/localconsts.h b/src/localconsts.h index 58b469f01..92c36d92a 100644 --- a/src/localconsts.h +++ b/src/localconsts.h @@ -33,13 +33,6 @@ #endif #endif -#ifndef DEBUGBUILD -#ifndef USE_INTERNALGUICHAN -#warning using depricated way for linking with guichan. \ - Please removed configure flag --without-internalguichan -#endif -#endif - #if !defined(__GXX_EXPERIMENTAL_CXX0X__) #undef nullptr #define nullptr 0 |