1 files changed, 93 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6a15306ba..29a0c610d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -55,9 +55,6 @@ ELSEIF (CMAKE_SYSTEM_NAME STREQUAL SunOS)
     SET(EXTRA_LIBRARIES intl)
 ENDIF()
 
-SET(GUICHAN_COMPONENTS "SDL")
-FIND_PACKAGE(Guichan REQUIRED ${GUICHAN_COMPONENTS})
-
 IF (WITH_OPENGL)
     FIND_PACKAGE(OpenGL REQUIRED)
     INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
@@ -82,7 +79,6 @@ INCLUDE_DIRECTORIES(
     ${PHYSFS_INCLUDE_DIR}
     ${CURL_INCLUDE_DIR}
     ${LIBXML2_INCLUDE_DIR}
-    ${GUICHAN_INCLUDE_DIR}
     )
 
 # enable rc-handling with mingw
@@ -576,6 +572,97 @@ SET(SRCS
     mumblemanager.h
     )
 
+SET(SRCS_GUICHAN
+    guichan/actionevent.hpp
+    guichan/actionlistener.hpp
+    guichan/basiccontainer.hpp
+    guichan/cliprectangle.hpp
+    guichan/color.hpp
+    guichan/defaultfont.hpp
+    guichan/event.hpp
+    guichan/exception.hpp
+    guichan/focushandler.hpp
+    guichan/focuslistener.hpp
+    guichan/font.hpp
+    guichan/graphics.hpp
+    guichan/gui.hpp
+    guichan/image.hpp
+    guichan/imageloader.hpp
+    guichan/input.hpp
+    guichan/inputevent.hpp
+    guichan/key.hpp
+    guichan/keyevent.hpp
+    guichan/keyinput.hpp
+    guichan/keylistener.hpp
+    guichan/listmodel.hpp
+    guichan/mouseevent.hpp
+    guichan/mouseinput.hpp
+    guichan/mouselistener.hpp
+    guichan/platform.hpp
+    guichan/rectangle.hpp
+    guichan/selectionevent.hpp
+    guichan/sdl/sdlgraphics.hpp
+    guichan/sdl/sdlimage.hpp
+    guichan/sdl/sdlpixel.hpp
+    guichan/widget.hpp
+    guichan/widgetlistener.hpp
+    guichan/widgets/button.hpp
+    guichan/widgets/checkbox.hpp
+    guichan/widgets/container.hpp
+    guichan/widgets/dropdown.hpp
+    guichan/widgets/icon.hpp
+    guichan/widgets/imagebutton.hpp
+    guichan/widgets/label.hpp
+    guichan/widgets/listbox.hpp
+    guichan/widgets/radiobutton.hpp
+    guichan/widgets/scrollarea.hpp
+    guichan/widgets/slider.hpp
+    guichan/widgets/tabbedarea.hpp
+    guichan/widgets/tab.hpp
+    guichan/widgets/textbox.hpp
+    guichan/widgets/textfield.hpp
+    guichan/widgets/window.hpp
+    guichan/actionevent.cpp
+    guichan/basiccontainer.cpp
+    guichan/cliprectangle.cpp
+    guichan/color.cpp
+    guichan/defaultfont.cpp
+    guichan/event.cpp
+    guichan/exception.cpp
+    guichan/focushandler.cpp
+    guichan/font.cpp
+    guichan/graphics.cpp
+    guichan/gui.cpp
+    guichan/image.cpp
+    guichan/inputevent.cpp
+    guichan/key.cpp
+    guichan/keyevent.cpp
+    guichan/keyinput.cpp
+    guichan/mouseevent.cpp
+    guichan/mouseinput.cpp
+    guichan/rectangle.cpp
+    guichan/selectionevent.cpp
+    guichan/widget.cpp
+    guichan/sdl/sdlgraphics.cpp
+    guichan/sdl/sdlimage.cpp
+    guichan/widgets/button.cpp
+    guichan/widgets/checkbox.cpp
+    guichan/widgets/container.cpp
+    guichan/widgets/dropdown.cpp
+    guichan/widgets/icon.cpp
+    guichan/widgets/imagebutton.cpp
+    guichan/widgets/label.cpp
+    guichan/widgets/listbox.cpp
+    guichan/widgets/radiobutton.cpp
+    guichan/widgets/scrollarea.cpp
+    guichan/widgets/slider.cpp
+    guichan/widgets/tabbedarea.cpp
+    guichan/widgets/tab.cpp
+    guichan/widgets/textbox.cpp
+    guichan/widgets/textfield.cpp
+    guichan/widgets/window.cpp
+    )
+
 SET(SRCS_EVOL
     net/ea/adminhandler.cpp
     net/ea/adminhandler.h
@@ -718,9 +805,9 @@ ENDIF ()
 SET (PROGRAMS manaplus)
 
 IF (ENABLE_MANASERV)
-    ADD_EXECUTABLE(manaplus WIN32 ${SRCS} ${SRCS_MANASERV} ${SRCS_TMWA} ${SRCS_EVOL})
+    ADD_EXECUTABLE(manaplus WIN32 ${SRCS_GUICHAN} ${SRCS} ${SRCS_MANASERV} ${SRCS_TMWA} ${SRCS_EVOL})
 ELSE(ENABLE_MANASERV)
-    ADD_EXECUTABLE(manaplus WIN32 ${SRCS} ${SRCS_TMWA} ${SRCS_EVOL})
+    ADD_EXECUTABLE(manaplus WIN32 ${SRCS_GUICHAN} ${SRCS} ${SRCS_TMWA} ${SRCS_EVOL})
 ENDIF(ENABLE_MANASERV)
 
 TARGET_LINK_LIBRARIES(manaplus
@@ -734,7 +821,6 @@ TARGET_LINK_LIBRARIES(manaplus
     ${PHYSFS_LIBRARY}
     ${CURL_LIBRARIES}
     ${LIBXML2_LIBRARIES}
-    ${GUICHAN_LIBRARIES}
     ${OPENGL_LIBRARIES}
     ${LIBINTL_LIBRARIES}
     ${EXTRA_LIBRARIES})