[Qonk-commit] SF.net SVN: qonk:[144] trunk

[<the...@us...>]

Revision: 144
          http://qonk.svn.sourceforge.net/qonk/?rev=144&view=rev
Author:   thebohemian
Date:     2009-02-10 20:39:53 +0000 (Tue, 10 Feb 2009)

Log Message:
-----------
 * added cmake based build system

Modified Paths:
--------------
    trunk/src/controloptions.cpp
    trunk/src/engine/canvas.h
    trunk/src/gameoptions.cpp
    trunk/src/main.cpp
    trunk/src/sdl_driver.h
    trunk/src/ui/menu.h
    trunk/src/ui/menuaction.cpp
    trunk/src/ui/menuaction.h
    trunk/src/ui/menuentry.cpp
    trunk/src/ui/menuentry.h
    trunk/src/ui/menusystem.h
    trunk/src/videooptions.cpp

Added Paths:
-----------
    trunk/CMakeLists.txt
    trunk/guichan/CMakeLists.txt
    trunk/guichan/guichan/CMakeLists.txt
    trunk/guichan/guichan/sdl/CMakeLists.txt
    trunk/guichan/guichan/widgets/CMakeLists.txt
    trunk/src/CMakeLists.txt
    trunk/src/engine/CMakeLists.txt
    trunk/src/lisp/CMakeLists.txt
    trunk/src/ui/CMakeLists.txt

Added: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	                        (rev 0)
+++ trunk/CMakeLists.txt	2009-02-10 20:39:53 UTC (rev 144)
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 2.6)
+
+project(QONK)
+set(QONK_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/games/qonk)
+set(PACKAGE_STRING "Qonk 0.3.0")
+
+enable_language(CXX)
+
+find_package(SDL 1.2 REQUIRED)
+find_package(SDL_ttf REQUIRED)
+find_package(SDL_image REQUIRED)
+find_library(SDLGFX_LIBRARY SDL_gfx)
+
+add_subdirectory(guichan)
+add_subdirectory(src)
+

Added: trunk/guichan/CMakeLists.txt
===================================================================
--- trunk/guichan/CMakeLists.txt	                        (rev 0)
+++ trunk/guichan/CMakeLists.txt	2009-02-10 20:39:53 UTC (rev 144)
@@ -0,0 +1,2 @@
+add_subdirectory(guichan)
+

Added: trunk/guichan/guichan/CMakeLists.txt
===================================================================
--- trunk/guichan/guichan/CMakeLists.txt	                        (rev 0)
+++ trunk/guichan/guichan/CMakeLists.txt	2009-02-10 20:39:53 UTC (rev 144)
@@ -0,0 +1,17 @@
+add_subdirectory(sdl)
+add_subdirectory(widgets)
+
+include_directories(${QONK_SOURCE_DIR}/guichan)
+link_directories(
+  ${QONK_BINARY_DIR}/guichan/guichan/widgets
+  ${QONK_BINARY_DIR}/guichan/guichan/sdl
+)
+
+add_library(guichan SHARED
+	actionevent.cpp basiccontainer.cpp cliprectangle.cpp color.cpp
+	defaultfont.cpp event.cpp exception.cpp focushandler.cpp font.cpp
+	graphics.cpp guichan.cpp gui.cpp image.cpp imagefont.cpp inputevent.cpp
+	key.cpp keyevent.cpp keyinput.cpp mouseevent.cpp mouseinput.cpp
+	rectangle.cpp widget.cpp
+)
+target_link_libraries(guichan guichan_sdl guichan_widgets)

Added: trunk/guichan/guichan/sdl/CMakeLists.txt
===================================================================
--- trunk/guichan/guichan/sdl/CMakeLists.txt	                        (rev 0)
+++ trunk/guichan/guichan/sdl/CMakeLists.txt	2009-02-10 20:39:53 UTC (rev 144)
@@ -0,0 +1,7 @@
+include_directories(${QONK_SOURCE_DIR}/guichan ${SDL_INCLUDE_DIR})
+
+add_library(guichan_sdl SHARED
+	sdl.cpp sdlgraphics.cpp sdlimage.cpp sdlimageloader.cpp sdlinput.cpp
+)
+target_link_libraries(guichan_sdl ${SDL_LIBRARY})
+

Added: trunk/guichan/guichan/widgets/CMakeLists.txt
===================================================================
--- trunk/guichan/guichan/widgets/CMakeLists.txt	                        (rev 0)
+++ trunk/guichan/guichan/widgets/CMakeLists.txt	2009-02-10 20:39:53 UTC (rev 144)
@@ -0,0 +1,7 @@
+include_directories(${QONK_SOURCE_DIR}/guichan)
+
+add_library(guichan_widgets SHARED
+	button.cpp checkbox.cpp container.cpp dropdown.cpp icon.cpp label.cpp
+	listbox.cpp radiobutton.cpp scrollarea.cpp slider.cpp textbox.cpp
+	textfield.cpp window.cpp
+)

Added: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	                        (rev 0)
+++ trunk/src/CMakeLists.txt	2009-02-10 20:39:53 UTC (rev 144)
@@ -0,0 +1,28 @@
+add_subdirectory(lisp)
+add_subdirectory(engine)
+add_subdirectory(ui)
+
+add_definitions(
+	-DPKG_DATA_DIR="${QONK_DATA_DIR}"
+	-DPACKAGE_STRING="${PACKAGE_STRING}"
+)
+
+include_directories(${QONK_SOURCE_DIR}/guichan)
+
+link_directories(
+	${QONK_BINARY_DIR}/guichan/guichan
+	${QONK_BINARY_DIR}/guichan/guichan/widgets
+	${QONK_BINARY_DIR}/guichan/guichan/sdl
+	${QONK_BINARY_DIR}/src/engine
+	${QONK_BINARY_DIR}/src/ui
+	${QONK_BINARY_DIR}/src/lisp
+)
+
+add_executable(qonk
+ controloptions.cpp fonts.cpp gameoptions.cpp main.cpp menumanager.cpp
+ sdl_driver.cpp settings.cpp videooptions.cpp
+)
+target_link_libraries(qonk
+	guichan guichan_widgets guichan_sdl engine lisp ui
+	${SDL_LIBRARY} ${SDLTTF_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLGFX_LIBRARY}
+)

Modified: trunk/src/controloptions.cpp
===================================================================
--- trunk/src/controloptions.cpp	2008-11-07 19:21:05 UTC (rev 143)
+++ trunk/src/controloptions.cpp	2009-02-10 20:39:53 UTC (rev 144)
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <map>
 
-#include "guichan/guichan.hpp"
+#include <guichan.hpp>
 
 #include "ui/menuaction.h"
 

Added: trunk/src/engine/CMakeLists.txt
===================================================================
--- trunk/src/engine/CMakeLists.txt	                        (rev 0)
+++ trunk/src/engine/CMakeLists.txt	2009-02-10 20:39:53 UTC (rev 144)
@@ -0,0 +1,4 @@
+add_library(engine STATIC actions.cpp animations.cpp canvas.cpp coordinate.cpp extensions.cpp game.cpp messages.cpp planets.cpp players.cpp selection.cpp ships.cpp stars.cpp timer.cpp universe.cpp)
+
+add_definitions(-DPKG_DATA_DIR="${QONK_DATA_DIR}")
+include_directories(${QONK_SOURCE_DIR}/guichan ${SDL_INCLUDE_DIR})

Modified: trunk/src/engine/canvas.h
===================================================================
--- trunk/src/engine/canvas.h	2008-11-07 19:21:05 UTC (rev 143)
+++ trunk/src/engine/canvas.h	2009-02-10 20:39:53 UTC (rev 144)
@@ -10,7 +10,7 @@
 
 #include <SDL/SDL.h>
 
-#include "guichan/guichan/sdl.hpp"
+#include "guichan/sdl.hpp"
 
 class Coordinate;
 class Font;

Modified: trunk/src/gameoptions.cpp
===================================================================
--- trunk/src/gameoptions.cpp	2008-11-07 19:21:05 UTC (rev 143)
+++ trunk/src/gameoptions.cpp	2009-02-10 20:39:53 UTC (rev 144)
@@ -3,7 +3,7 @@
 
 #include <SDL/SDL.h>
 
-#include "guichan/guichan.hpp"
+#include <guichan.hpp>
 
 #include "ui/menuaction.h"
 

Added: trunk/src/lisp/CMakeLists.txt
===================================================================
--- trunk/src/lisp/CMakeLists.txt	                        (rev 0)
+++ trunk/src/lisp/CMakeLists.txt	2009-02-10 20:39:53 UTC (rev 144)
@@ -0,0 +1 @@
+add_library(lisp STATIC lexer.cpp lisp.cpp parser.cpp writer.cpp)

Modified: trunk/src/main.cpp
===================================================================
--- trunk/src/main.cpp	2008-11-07 19:21:05 UTC (rev 143)
+++ trunk/src/main.cpp	2009-02-10 20:39:53 UTC (rev 144)
@@ -225,7 +225,7 @@
 
   cout << "This is " << PACKAGE_STRING << endl;
   cout << "(c) 2003 Anthony Liekens" << endl;
-  cout << "(c) 2007 Qonk development team" << endl;
+  cout << "(c) 2007, 2008, 2009 Qonk development team" << endl;
   cout << "This game is free software released under the GNU General Public License, " << endl;
   cout << "either version 2 of the license or, at your option, any later version. " << endl;
 

Modified: trunk/src/sdl_driver.h
===================================================================
--- trunk/src/sdl_driver.h	2008-11-07 19:21:05 UTC (rev 143)
+++ trunk/src/sdl_driver.h	2009-02-10 20:39:53 UTC (rev 144)
@@ -9,8 +9,8 @@
 
 #include <SDL/SDL.h>
 
-#include "guichan/guichan.hpp"
-#include "guichan/guichan/sdl.hpp"
+#include <guichan.hpp>
+#include <guichan/sdl.hpp>
 
 #include "input.h"
 

Added: trunk/src/ui/CMakeLists.txt
===================================================================
--- trunk/src/ui/CMakeLists.txt	                        (rev 0)
+++ trunk/src/ui/CMakeLists.txt	2009-02-10 20:39:53 UTC (rev 144)
@@ -0,0 +1,5 @@
+add_library(ui STATIC menuaction.cpp menu.cpp menuentry.cpp menusystem.cpp)
+add_definitions(-DPKG_DATA_DIR="${QONK_DATA_DIR}")
+
+include_directories(${QONK_SOURCE_DIR}/guichan)
+

Modified: trunk/src/ui/menu.h
===================================================================
--- trunk/src/ui/menu.h	2008-11-07 19:21:05 UTC (rev 143)
+++ trunk/src/ui/menu.h	2009-02-10 20:39:53 UTC (rev 144)
@@ -9,7 +9,7 @@
 
 #include <vector>
 
-#include "guichan/guichan.hpp"
+#include "guichan.hpp"
 
 class MenuSystem;
 class MenuEntry;

Modified: trunk/src/ui/menuaction.cpp
===================================================================
--- trunk/src/ui/menuaction.cpp	2008-11-07 19:21:05 UTC (rev 143)
+++ trunk/src/ui/menuaction.cpp	2009-02-10 20:39:53 UTC (rev 144)
@@ -1,4 +1,4 @@
-#include "guichan/guichan.hpp"
+#include "guichan.hpp"
 
 #include "menuaction.h"
 

Modified: trunk/src/ui/menuaction.h
===================================================================
--- trunk/src/ui/menuaction.h	2008-11-07 19:21:05 UTC (rev 143)
+++ trunk/src/ui/menuaction.h	2009-02-10 20:39:53 UTC (rev 144)
@@ -7,7 +7,7 @@
 #ifndef MENUACTION_H
 #define MENUACTION_H
 
-#include "guichan/guichan.hpp"
+#include "guichan.hpp"
 
 /* TODO: Realize all customized behavior with specific MenuEntry subclasses
  * and remove the need for a MenuAction delegate object.

Modified: trunk/src/ui/menuentry.cpp
===================================================================
--- trunk/src/ui/menuentry.cpp	2008-11-07 19:21:05 UTC (rev 143)
+++ trunk/src/ui/menuentry.cpp	2009-02-10 20:39:53 UTC (rev 144)
@@ -1,4 +1,4 @@
-#include "guichan/guichan.hpp"
+#include "guichan.hpp"
 
 #include "menuentry.h"
 #include "menusystem.h"

Modified: trunk/src/ui/menuentry.h
===================================================================
--- trunk/src/ui/menuentry.h	2008-11-07 19:21:05 UTC (rev 143)
+++ trunk/src/ui/menuentry.h	2009-02-10 20:39:53 UTC (rev 144)
@@ -7,7 +7,7 @@
 #ifndef MENUENTRY_H
 #define MENUENTRY_H
 
-#include "guichan/guichan.hpp"
+#include "guichan.hpp"
 
 class MenuSystem;
 

Modified: trunk/src/ui/menusystem.h
===================================================================
--- trunk/src/ui/menusystem.h	2008-11-07 19:21:05 UTC (rev 143)
+++ trunk/src/ui/menusystem.h	2009-02-10 20:39:53 UTC (rev 144)
@@ -9,8 +9,8 @@
 
 #include <map>
 
-#include "guichan/guichan.hpp"
-#include "guichan/guichan/sdl.hpp"
+#include "guichan.hpp"
+#include "guichan/sdl.hpp"
 
 #include "menu.h"
 

Modified: trunk/src/videooptions.cpp
===================================================================
--- trunk/src/videooptions.cpp	2008-11-07 19:21:05 UTC (rev 143)
+++ trunk/src/videooptions.cpp	2009-02-10 20:39:53 UTC (rev 144)
@@ -4,7 +4,7 @@
 
 #include <SDL/SDL.h>
 
-#include "guichan/guichan.hpp"
+#include <guichan.hpp>
 
 #include "ui/menuaction.h"
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.