From cfedddcae0d7c21ff27eed4a7e174bd88043dca2 Mon Sep 17 00:00:00 2001
From: martin <martin@phalanx>
Date: Thu, 2 Dec 2010 19:56:55 +0100
Subject: [PATCH] prepared for debian packaging

---
 .hgignore                                     |  2 ++
 CMakeLists.txt                                | 26 ++++++++++++-------
 asteroids/Controller.cc                       |  6 ++---
 config.rc                                     |  2 ++
 depends.txt                                   |  4 +++
 engine/CMakeLists.txt                         |  6 +----
 engine/libraries/coll2d/CMakeLists.txt        |  2 +-
 engine/libraries/mathlib/CMakeLists.txt       |  2 +-
 .../libraries/oglft/liboglft/CMakeLists.txt   |  4 +--
 9 files changed, 33 insertions(+), 21 deletions(-)
 create mode 100644 config.rc
 create mode 100644 depends.txt

diff --git a/.hgignore b/.hgignore
index 88b8636..da650e5 100644
--- a/.hgignore
+++ b/.hgignore
@@ -6,12 +6,14 @@ install_manifest.txt
 debug
 tags
 Makefile
+engine/libraries/oglft/liboglft/OGLFT.h
 
 start
 runtests
 run_asteroids
 config.rc
 
+Debug/
 ./doc/html/*
 
 *.log
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92e7ecc..68b918e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,14 @@
-PROJECT ( Asteroids )
+PROJECT ( Asteroids CXX )
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
 LIST( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake )
 
-# FIND_PACKAGE (Cal3D REQUIRED)
+# Perform the proper linking
+SET (CMAKE_SKIP_BUILD_RPATH FALSE)
+SET (CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+SET (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+SET (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 INCLUDE_DIRECTORIES ( 
 	engine/
@@ -12,14 +16,10 @@ INCLUDE_DIRECTORIES (
 	include/
 	engine/libraries/mathlib/
 	engine/libraries/coll2d/include
-	engine/libraries/oglft/
+	engine/libraries/oglft/liboglft
 	${FREETYPE2_INCLUDE_DIR}
 	)
 
-SET_TARGET_PROPERTIES ( ${PROJECT_EXECUTABLES} PROPERTIES
-		LINKER_LANGUAGE CXX
-	)
-
 ADD_SUBDIRECTORY ( engine )
 
 SET ( ASTEROIDS_SOURCES 
@@ -38,9 +38,17 @@ SET ( ASTEROIDS_SOURCES
 	asteroids/View.cc
 	)
 
-ADD_EXECUTABLE ( run_asteroids ${ASTEROIDS_SOURCES} ) 
+ADD_EXECUTABLE ( fysx_asteroids ${ASTEROIDS_SOURCES} ) 
 
-TARGET_LINK_LIBRARIES ( run_asteroids
+TARGET_LINK_LIBRARIES ( fysx_asteroids
 	Engine
 	oglft
 	)
+
+SET ( DATA_DIR
+	data/
+	)
+
+INSTALL (DIRECTORY ${DATA_DIR}
+	DESTINATION share/fysxasteroids
+	)
diff --git a/asteroids/Controller.cc b/asteroids/Controller.cc
index c5ad7ab..8ce48f3 100644
--- a/asteroids/Controller.cc
+++ b/asteroids/Controller.cc
@@ -11,9 +11,9 @@ int Controller::OnInit (int argc, char *argv[]) {
 
 	mBindings[SDLK_q] = "quit";
 	
-	mBindings[SDLK_v] = "+forward";
-	mBindings[SDLK_h] = "+turnleft";
-	mBindings[SDLK_g] = "+turnright";
+	mBindings[SDLK_UP] = "+forward";
+	mBindings[SDLK_LEFT] = "+turnleft";
+	mBindings[SDLK_RIGHT] = "+turnright";
 
 	mBindings[SDLK_SPACE] = "attack";
 
diff --git a/config.rc b/config.rc
new file mode 100644
index 0000000..a8899b7
--- /dev/null
+++ b/config.rc
@@ -0,0 +1,2 @@
+set effects_volume 1
+set music_volume 0.585938
diff --git a/depends.txt b/depends.txt
new file mode 100644
index 0000000..56af2dc
--- /dev/null
+++ b/depends.txt
@@ -0,0 +1,4 @@
+This is a non-exhaustive list of packages you need to compile this game under
+debian:
+
+cmake, libsdl1.2-dev, libsdl-mixer1.2-dev, libfreetype6-dev, libpng12-dev, libboost1.42-dev, libboost-filesystem1.42-dev, libgl1-mesa-dev, libglu1-mesa-dev, mesa-common-dev
diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
index ae577ad..d75232b 100644
--- a/engine/CMakeLists.txt
+++ b/engine/CMakeLists.txt
@@ -49,11 +49,7 @@ INCLUDE_DIRECTORIES (
 	${FREETYPE2_INCLUDE_DIR}
 	)
 
-IF ( WIN32 )
-	ADD_LIBRARY ( Engine STATIC ${ENGINE_SRCS} )
-ELSE ( WIN32 )
-	ADD_LIBRARY ( Engine SHARED ${ENGINE_SRCS} )
-ENDIF ( WIN32 )
+ADD_LIBRARY ( Engine STATIC ${ENGINE_SRCS} )
 
 TARGET_LINK_LIBRARIES ( Engine
 	${SDL_LIBRARY}
diff --git a/engine/libraries/coll2d/CMakeLists.txt b/engine/libraries/coll2d/CMakeLists.txt
index 548c17f..dba3743 100644
--- a/engine/libraries/coll2d/CMakeLists.txt
+++ b/engine/libraries/coll2d/CMakeLists.txt
@@ -17,5 +17,5 @@ SET_TARGET_PROPERTIES ( ${PROJECT_EXECUTABLES} PROPERTIES
 
 SUBDIRS (tests)
 
-ADD_LIBRARY ( coll2d SHARED ${COLL2D_SRCS} )
+ADD_LIBRARY ( coll2d STATIC ${COLL2D_SRCS} )
 
diff --git a/engine/libraries/mathlib/CMakeLists.txt b/engine/libraries/mathlib/CMakeLists.txt
index 724a06b..f78b45d 100644
--- a/engine/libraries/mathlib/CMakeLists.txt
+++ b/engine/libraries/mathlib/CMakeLists.txt
@@ -6,4 +6,4 @@ SET ( SRCS
 	mathlib.cc
 	main.cc
 	)
-ADD_LIBRARY ( mathlib SHARED mathlib.cc mathlib.h)
+ADD_LIBRARY ( mathlib STATIC mathlib.cc mathlib.h)
diff --git a/engine/libraries/oglft/liboglft/CMakeLists.txt b/engine/libraries/oglft/liboglft/CMakeLists.txt
index ef0805c..e2c3cf0 100644
--- a/engine/libraries/oglft/liboglft/CMakeLists.txt
+++ b/engine/libraries/oglft/liboglft/CMakeLists.txt
@@ -16,7 +16,7 @@ INCLUDE_DIRECTORIES(
 INCLUDE_DIRECTORIES( ${PROJECT_BINARY_DIR} )
 CONFIGURE_FILE(
    "${CMAKE_CURRENT_SOURCE_DIR}/OGLFT.h.cmake"
-   "${PROJECT_BINARY_DIR}/OGLFT.h"
+   "${CMAKE_CURRENT_SOURCE_DIR}/OGLFT.h"
 )
 
 IF( WIN32 )
@@ -38,7 +38,7 @@ INSTALL(
 )
 
 INSTALL(
-  FILES "${PROJECT_BINARY_DIR}/OGLFT.h"
+  FILES "${CMAKE_CURRENT_SOURCE_DIR}/OGLFT.h"
   DESTINATION include/OGLFT
     PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
   COMPONENT headers