Merged CMake branch

2 files changed, 304 insertions, 1 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 00000000..3e4550c7
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,303 @@
+FIND_PACKAGE(SDL REQUIRED)
+FIND_PACKAGE(SDL_image REQUIRED)
+FIND_PACKAGE(SDL_mixer REQUIRED)
+FIND_PACKAGE(SDL_net REQUIRED)
+
+FIND_PACKAGE(Libcurl REQUIRED)
+FIND_PACKAGE(LibXml2 REQUIRED)
+FIND_PACKAGE(PhysFS REQUIRED)
+FIND_PACKAGE(PNG REQUIRED)
+
+SET(FLAGS "-DPACKAGE_VERSION=\\\"${VERSION}\\\"")
+SET(FLAGS "${FLAGS} -DTMW_DATADIR=\\\"${PKG_DATADIR}/\\\"")
+
+SET(GUICHAN_COMPONENTS "SDL")
+IF (WITH_OPENGL)
+    SET(GUICHAN_COMPONENTS ${GUICHAN_COMPONENTS} "OpenGL")
+ENDIF (WITH_OPENGL)
+FIND_PACKAGE(Guichan REQUIRED ${GUICHAN_COMPONENTS})
+
+IF (WITH_OPENGL)
+    FIND_PACKAGE(OpenGL REQUIRED)
+    INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
+    SET(FLAGS "${FLAGS} -DUSE_OPENGL")
+ENDIF (WITH_OPENGL)
+
+INCLUDE_DIRECTORIES(
+    ${CURRENT_SOURCE_DIR}
+    ${SDL_INCLUDE_DIR}
+    ${SDLIMAGE_INCLUDE_DIR}
+    ${SDLMIXER_INCLUDE_DIR}
+    ${SDLNET_INCLUDE_DIR}
+    ${PNG_INCLUDE_DIR}
+    ${PHYSFS_INCLUDE_DIR}
+    ${LIBCURL_INCLUDE_DIR}
+    ${LIBXML2_INCLUDE_DIR}
+    ${GUICHAN_INCLUDE_DIR}
+    )
+
+SET(SRCS
+    graphic/imagerect.h
+    gui/browserbox.cpp
+    gui/browserbox.h
+    gui/buddywindow.cpp
+    gui/buddywindow.h
+    gui/button.cpp
+    gui/button.h
+    gui/buy.cpp
+    gui/buy.h
+    gui/buysell.cpp
+    gui/buysell.h
+    gui/chargedialog.cpp
+    gui/chargedialog.h
+    gui/char_server.cpp
+    gui/char_server.h
+    gui/char_select.cpp
+    gui/char_select.h
+    gui/chat.cpp
+    gui/chat.h
+    gui/chatinput.cpp
+    gui/chatinput.h
+    gui/checkbox.cpp
+    gui/checkbox.h
+    gui/confirm_dialog.cpp
+    gui/confirm_dialog.h
+    gui/connection.cpp
+    gui/connection.h
+    gui/debugwindow.cpp
+    gui/debugwindow.h
+    gui/equipmentwindow.cpp
+    gui/equipmentwindow.h
+    gui/focushandler.cpp
+    gui/focushandler.h
+    gui/gccontainer.cpp
+    gui/gccontainer.h
+    gui/gui.cpp
+    gui/gui.h
+    gui/help.cpp
+    gui/help.h
+    gui/inventorywindow.cpp
+    gui/inventorywindow.h
+    gui/itemcontainer.cpp
+    gui/itemcontainer.h
+    gui/item_amount.cpp
+    gui/item_amount.h
+    gui/linkhandler.h
+    gui/listbox.cpp
+    gui/listbox.h
+    gui/login.cpp
+    gui/login.h
+    gui/menuwindow.cpp
+    gui/menuwindow.h
+    gui/minimap.cpp
+    gui/minimap.h
+    gui/ministatus.cpp
+    gui/ministatus.h
+    gui/newskill.cpp
+    gui/newskill.h
+    gui/npclistdialog.cpp
+    gui/npclistdialog.h
+    gui/npc_text.cpp
+    gui/npc_text.h
+    gui/ok_dialog.cpp
+    gui/ok_dialog.h
+    gui/passwordfield.cpp
+    gui/passwordfield.h
+    gui/playerbox.cpp
+    gui/playerbox.h
+    gui/popupmenu.cpp
+    gui/popupmenu.h
+    gui/progressbar.cpp
+    gui/progressbar.h
+    gui/radiobutton.cpp
+    gui/radiobutton.h
+    gui/register.cpp
+    gui/register.h
+    gui/scrollarea.cpp
+    gui/scrollarea.h
+    gui/selectionlistener.h
+    gui/sell.cpp
+    gui/sell.h
+    gui/setup_audio.cpp
+    gui/setup_audio.h
+    gui/setup.cpp
+    gui/setup.h
+    gui/setup_joystick.cpp
+    gui/setup_joystick.h
+    gui/setuptab.h
+    gui/setup_video.cpp
+    gui/setup_video.h
+    gui/shop.cpp
+    gui/shop.h
+    gui/skill.cpp
+    gui/skill.h
+    gui/slider.cpp
+    gui/slider.h
+    gui/status.cpp
+    gui/status.h
+    gui/tabbedcontainer.cpp
+    gui/tabbedcontainer.h
+    gui/textbox.cpp
+    gui/textbox.h
+    gui/textfield.cpp
+    gui/textfield.h
+    gui/trade.cpp
+    gui/trade.h
+    gui/window.cpp
+    gui/window.h
+    gui/windowcontainer.cpp
+    gui/windowcontainer.h
+    gui/inttextbox.h
+    gui/inttextbox.cpp
+    gui/box.h
+    gui/box.cpp
+    gui/vbox.h
+    gui/vbox.cpp
+    gui/hbox.h
+    gui/hbox.cpp
+    gui/updatewindow.h
+    gui/updatewindow.cpp
+    net/beinghandler.h
+    net/beinghandler.cpp
+    net/buysellhandler.h
+    net/buysellhandler.cpp
+    net/charserverhandler.h
+    net/charserverhandler.cpp
+    net/chathandler.h
+    net/chathandler.cpp
+    net/equipmenthandler.h
+    net/equipmenthandler.cpp
+    net/inventoryhandler.h
+    net/inventoryhandler.cpp
+    net/itemhandler.h
+    net/itemhandler.cpp
+    net/loginhandler.h
+    net/loginhandler.cpp
+    net/maploginhandler.cpp
+    net/maploginhandler.h
+    net/messagehandler.cpp
+    net/messagehandler.h
+    net/messagein.cpp
+    net/messagein.h
+    net/messageout.cpp
+    net/messageout.h
+    net/network.cpp
+    net/network.h
+    net/npchandler.cpp
+    net/npchandler.h
+    net/packet.cpp
+    net/packet.h
+    net/playerhandler.cpp
+    net/playerhandler.h
+    net/protocol.cpp
+    net/protocol.h
+    net/skillhandler.cpp
+    net/skillhandler.h
+    net/tradehandler.cpp
+    net/tradehandler.h
+    resources/ambientoverlay.cpp
+    resources/ambientoverlay.h
+    resources/image.cpp
+    resources/image.h
+    resources/imagewriter.cpp
+    resources/imagewriter.h
+    resources/iteminfo.h
+    resources/iteminfo.cpp
+    resources/itemmanager.cpp
+    resources/itemmanager.h
+    resources/mapreader.cpp
+    resources/mapreader.h
+    resources/music.h
+    resources/music.cpp
+    resources/openglsdlimageloader.h
+    resources/openglsdlimageloader.cpp
+    resources/resource.cpp
+    resources/resource.h
+    resources/resourcemanager.cpp
+    resources/resourcemanager.h
+    resources/sdlimageloader.h
+    resources/sdlimageloader.cpp
+    resources/soundeffect.h
+    resources/soundeffect.cpp
+    resources/spriteset.h
+    resources/spriteset.cpp
+    resources/buddylist.h
+    resources/buddylist.cpp
+    utils/dtor.h
+    utils/tostring.h
+    animatedsprite.cpp
+    animatedsprite.h
+    animation.cpp
+    animation.h
+    base64.cpp
+    base64.h
+    being.cpp
+    being.h
+    beingmanager.cpp
+    beingmanager.h
+    configlistener.h
+    configuration.cpp
+    configuration.h
+    engine.cpp
+    engine.h
+    equipment.cpp
+    equipment.h
+    floor_item.cpp
+    floor_item.h
+    flooritemmanager.cpp
+    flooritemmanager.h
+    game.cpp
+    game.h
+    graphics.cpp
+    graphics.h
+    guichanfwd.h
+    inventory.cpp
+    inventory.h
+    item.cpp
+    item.h
+    joystick.cpp
+    joystick.h
+    localplayer.cpp
+    localplayer.h
+    lockedarray.h
+    log.cpp
+    log.h
+    logindata.h
+    main.cpp
+    main.h
+    map.cpp
+    map.h
+    monster.cpp
+    monster.h
+    npc.cpp
+    npc.h
+    openglgraphics.cpp
+    openglgraphics.h
+    player.cpp
+    player.h
+    properties.h
+    serverinfo.h
+    sound.cpp
+    sound.h
+    sprite.h
+    tileset.h
+    )
+
+ADD_EXECUTABLE(tmw ${SRCS})
+
+TARGET_LINK_LIBRARIES(tmw
+    ${SDL_LIBRARY}
+    ${SDLIMAGE_LIBRARY}
+    ${SDLMIXER_LIBRARY}
+    ${SDLNET_LIBRARY}
+    ${PNG_LIBRARIES}
+    ${PHYSFS_LIBRARY}
+    ${LIBCURL_LIBRARIES}
+    ${LIBXML2_LIBRARIES}
+    ${GUICHAN_LIBRARIES}
+    ${OPENGL_LIBRARIES}
+    )
+
+INSTALL(TARGETS tmw RUNTIME DESTINATION ${PKG_BINDIR})
+
+SET_TARGET_PROPERTIES(tmw PROPERTIES COMPILE_FLAGS "${FLAGS}")
diff --git a/src/main.h b/src/main.h
index f8bfb4d9..4aa3fc13 100644
--- a/src/main.h
+++ b/src/main.h
@@ -26,7 +26,7 @@
 
 #include <string>
 
-#if (defined __USE_UNIX98 || defined __FreeBSD__)
+#ifdef HAVE_CONFIG_H
 #include "../config.h"
 #elif defined WIN32
 #include "../The_Mana_World_private.h"