move exguichan files into gui/base/

1 files changed, 74 insertions, 78 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fafeeaf5d..f540d2552 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -62,7 +62,6 @@ IF (USE_X11)
 ENDIF (USE_X11)
 
 INCLUDE_DIRECTORIES(
-    "guichan/include"
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${SDL_INCLUDE_DIR}
     ${SDLIMAGE_INCLUDE_DIR}
@@ -770,81 +769,78 @@ SET(SRCS
     vector.h
     walklayer.cpp
     walklayer.h
-    )
-
-SET(SRCS_GUICHAN
-    guichan/include/guichan/actionevent.hpp
-    guichan/include/guichan/actionlistener.hpp
-    guichan/include/guichan/basiccontainer.hpp
-    guichan/include/guichan/cliprectangle.hpp
-    guichan/include/guichan/color.hpp
-    guichan/include/guichan/deathlistener.hpp
-    guichan/include/guichan/event.hpp
-    guichan/include/guichan/exception.hpp
-    guichan/include/guichan/focushandler.hpp
-    guichan/include/guichan/focuslistener.hpp
-    guichan/include/guichan/font.hpp
-    guichan/include/guichan/graphics.hpp
-    guichan/include/guichan/gui.hpp
-    guichan/include/guichan/image.hpp
-    guichan/include/guichan/input.hpp
-    guichan/include/guichan/inputevent.hpp
-    guichan/include/guichan/key.hpp
-    guichan/include/guichan/keyevent.hpp
-    guichan/include/guichan/keyinput.hpp
-    guichan/include/guichan/keylistener.hpp
-    guichan/include/guichan/listmodel.hpp
-    guichan/include/guichan/mouseevent.hpp
-    guichan/include/guichan/mouseinput.hpp
-    guichan/include/guichan/mouselistener.hpp
-    guichan/include/guichan/rectangle.hpp
-    guichan/include/guichan/selectionevent.hpp
-    guichan/include/guichan/selectionlistener.hpp
-    guichan/include/guichan/sdl/sdlpixel.hpp
-    guichan/include/guichan/widget.hpp
-    guichan/include/guichan/widgetlistener.hpp
-    guichan/include/guichan/widgets/button.hpp
-    guichan/include/guichan/widgets/checkbox.hpp
-    guichan/include/guichan/widgets/container.hpp
-    guichan/include/guichan/widgets/label.hpp
-    guichan/include/guichan/widgets/listbox.hpp
-    guichan/include/guichan/widgets/radiobutton.hpp
-    guichan/include/guichan/widgets/scrollarea.hpp
-    guichan/include/guichan/widgets/slider.hpp
-    guichan/include/guichan/widgets/textbox.hpp
-    guichan/include/guichan/widgets/textfield.hpp
-    guichan/include/guichan/widgets/window.hpp
-    guichan/actionevent.cpp
-    guichan/basiccontainer.cpp
-    guichan/cliprectangle.cpp
-    guichan/color.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/widgets/button.cpp
-    guichan/widgets/checkbox.cpp
-    guichan/widgets/container.cpp
-    guichan/widgets/label.cpp
-    guichan/widgets/listbox.cpp
-    guichan/widgets/radiobutton.cpp
-    guichan/widgets/scrollarea.cpp
-    guichan/widgets/slider.cpp
-    guichan/widgets/textbox.cpp
-    guichan/widgets/textfield.cpp
-    guichan/widgets/window.cpp
+    gui/base/actionevent.hpp
+    gui/base/actionlistener.hpp
+    gui/base/basiccontainer.hpp
+    gui/base/cliprectangle.hpp
+    gui/base/color.hpp
+    gui/base/deathlistener.hpp
+    gui/base/event.hpp
+    gui/base/exception.hpp
+    gui/base/focushandler.hpp
+    gui/base/focuslistener.hpp
+    gui/base/font.hpp
+    gui/base/graphics.hpp
+    gui/base/gui.hpp
+    gui/base/image.hpp
+    gui/base/input.hpp
+    gui/base/inputevent.hpp
+    gui/base/key.hpp
+    gui/base/keyevent.hpp
+    gui/base/keyinput.hpp
+    gui/base/keylistener.hpp
+    gui/base/listmodel.hpp
+    gui/base/mouseevent.hpp
+    gui/base/mouseinput.hpp
+    gui/base/mouselistener.hpp
+    gui/base/rectangle.hpp
+    gui/base/selectionevent.hpp
+    gui/base/selectionlistener.hpp
+    gui/base/sdl/sdlpixel.hpp
+    gui/base/widget.hpp
+    gui/base/widgetlistener.hpp
+    gui/base/widgets/button.hpp
+    gui/base/widgets/checkbox.hpp
+    gui/base/widgets/container.hpp
+    gui/base/widgets/label.hpp
+    gui/base/widgets/listbox.hpp
+    gui/base/widgets/radiobutton.hpp
+    gui/base/widgets/scrollarea.hpp
+    gui/base/widgets/slider.hpp
+    gui/base/widgets/textbox.hpp
+    gui/base/widgets/textfield.hpp
+    gui/base/widgets/window.hpp
+    gui/base/actionevent.cpp
+    gui/base/basiccontainer.cpp
+    gui/base/cliprectangle.cpp
+    gui/base/color.cpp
+    gui/base/event.cpp
+    gui/base/exception.cpp
+    gui/base/focushandler.cpp
+    gui/base/font.cpp
+    gui/base/graphics.cpp
+    gui/base/gui.cpp
+    gui/base/image.cpp
+    gui/base/inputevent.cpp
+    gui/base/key.cpp
+    gui/base/keyevent.cpp
+    gui/base/keyinput.cpp
+    gui/base/mouseevent.cpp
+    gui/base/mouseinput.cpp
+    gui/base/rectangle.cpp
+    gui/base/selectionevent.cpp
+    gui/base/widget.cpp
+    gui/base/widgets/button.cpp
+    gui/base/widgets/checkbox.cpp
+    gui/base/widgets/container.cpp
+    gui/base/widgets/label.cpp
+    gui/base/widgets/listbox.cpp
+    gui/base/widgets/radiobutton.cpp
+    gui/base/widgets/scrollarea.cpp
+    gui/base/widgets/slider.cpp
+    gui/base/widgets/textbox.cpp
+    gui/base/widgets/textfield.cpp
+    gui/base/widgets/window.cpp
     )
 
 SET(SRCS_EVOL
@@ -1000,9 +996,9 @@ ENDIF ()
 SET (PROGRAMS manaplus)
 
 IF (ENABLE_EATHENA)
-    ADD_EXECUTABLE(manaplus WIN32 ${SRCS_GUICHAN} ${SRCS} ${SRCS_EATHENA} ${SRCS_TMWA} ${SRCS_EVOL})
+    ADD_EXECUTABLE(manaplus WIN32 ${SRCS} ${SRCS_EATHENA} ${SRCS_TMWA} ${SRCS_EVOL})
 ELSE(ENABLE_EATHENA)
-    ADD_EXECUTABLE(manaplus WIN32 ${SRCS_GUICHAN} ${SRCS} ${SRCS_TMWA} ${SRCS_EVOL})
+    ADD_EXECUTABLE(manaplus WIN32 ${SRCS} ${SRCS_TMWA} ${SRCS_EVOL})
 ENDIF(ENABLE_EATHENA)
 
 TARGET_LINK_LIBRARIES(manaplus