make install should work properly on Mac and Linux

CMakeLists.txt

@@ -82,6 +82,15 @@ add_subdirectory (test)
 
 #################################################################
 
+# CPack packaging
+include (InstallRequiredSystemLibraries)
+set (CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md")
+set (CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/COPYING")
+set (CPACK_MONOLITHIC_INSTALL YES)
+include (CPack)
+
+#################################################################
+
 if (${CMAKE_GENERATOR} STREQUAL "MinGW Makefiles")
 
 	# Target for running the setup

ChangeLog.md

@@ -2,6 +2,12 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20141010 ]
+    * Added CPack packaging to the CMake script
+    * Added suitable install target for the Mac App Bundle
+    * Now also trying to load config from ${DESTDIR}/etc/OpenRaider.ini if all else fails
+    * Added suitable install target for Linux that does not need a setup script
+
     [ 20141008 ]
     * Added freeGLUT windowing system to use if SDL2 is not available. Not yet working 100%.
     * Moved unnecessarily duplicated code to Window base class

README.md

@@ -69,7 +69,9 @@ Do a standard cmake out-of-source build to get a debug configuration and then ru
     cmake ..
     make run
 
-On Mac OS X, running `make install` will produce a (more or less) distributable OpenRaider.app bundle.
+On Mac OS X, running `make install` will produce a (more or less) distributable OpenRaider.app bundle, which will be put into /Applications.
+
+On Linux, running `make install` will install OpenRaider to /usr/local/... (the executable in bin, the config in etc, the data files in share). You can change this path with `make install DESTDIR=”/some/where”`
 
 Run `make check` to build and run the unit tests.
 
@@ -86,6 +88,7 @@ You can also generate working XCode Project files with `cmake -G Xcode ..`.
 ### Configuration file
 
 OpenRaider will try to load `~/.OpenRaider/OpenRaider.ini` or, if it doesn't exist, `OpenRaider.ini` from the current directory.
+
 Running `make setup` will create a minimal configuration in your home directory.
 
 The configuration file format is very simple:

cmake/setup.sh

@@ -1,13 +1,16 @@
 #!/bin/sh
 
 echo "Setting up OpenRaider for user $USER..."
+
 mkdir -p ~/.OpenRaider
-cp data/OpenRaider.ini ~/.OpenRaider/
 mkdir -p ~/.OpenRaider/paks
 mkdir -p ~/.OpenRaider/music
 mkdir -p ~/.OpenRaider/data
 mkdir -p ~/.OpenRaider/sshots
+
+cp data/OpenRaider.ini ~/.OpenRaider/
 cp data/*.tga ~/.OpenRaider/data
 cp data/*.ttf ~/.OpenRaider/data
 cp data/*.pc ~/.OpenRaider/data
+
 echo "DONE"

cmake/setup_mac.sh

@@ -3,11 +3,11 @@ cd `dirname $0`
 if [ ! -d "${HOME}/.OpenRaider" ]; then
     echo "Setting up OpenRaider for user $USER..."
     mkdir -p ~/.OpenRaider
-    cp ../Resources/defaults/OpenRaider.ini ~/.OpenRaider/
     mkdir -p ~/.OpenRaider/paks
     mkdir -p ~/.OpenRaider/music
     mkdir -p ~/.OpenRaider/data
     mkdir -p ~/.OpenRaider/sshots
+    cp ../Resources/defaults/OpenRaider.ini ~/.OpenRaider/
     cp ../Resources/defaults/*.tga ~/.OpenRaider/data
     cp ../Resources/defaults/*.ttf ~/.OpenRaider/data
     cp ../Resources/defaults/*.pc ~/.OpenRaider/data

cmake/setup_win.bat

@@ -3,11 +3,11 @@
 if not exist "%UserProfile%\.OpenRaider" (
 	echo Setting up for %UserName%...
 	mkdir "%UserProfile%\.OpenRaider"
-	copy data\OpenRaider.ini %UserProfile%\.OpenRaider
 	mkdir %UserProfile%\.OpenRaider\paks
 	mkdir %UserProfile%\.OpenRaider\music
 	mkdir %UserProfile%\.OpenRaider\data
 	mkdir %UserProfile%\.OpenRaider\sshots
+	copy data\OpenRaider.ini %UserProfile%\.OpenRaider
 	copy data\*.tga %UserProfile%\.OpenRaider\data
 	copy data\*.ttf %UserProfile%\.OpenRaider\data
 	copy data\*.pc %UserProfile%\.OpenRaider\data

data/Unix.in

@@ -0,0 +1,33 @@
+# OpenRaider configuration file
+
+# File locations
+set basedir    "@CMAKE_INSTALL_PREFIX@"
+set datadir    "$(basedir)/share/OpenRaider"
+set pakdir     "$(datadir)"
+set audiodir   "$(datadir)"
+set font       "$(datadir)/test.ttf"
+# set font       "$(datadir)/font.pc"
+
+# Windowing
+set size       1280 720
+set fullscreen false
+
+# Audio
+set audio      true # Enable Audio Output
+set volume     0.5
+
+# Input
+set mouse_x    0.75
+set mouse_y    0.75
+
+bind menu     "escape"
+bind debug    'q'
+bind forward  'w'
+bind backward 's'
+bind left     'a'
+bind right    'd'
+bind jump     "space"
+bind crouch   "leftctrl"
+bind use      "leftmouse"
+bind holster  "rightmouse"
+bind walk     "leftshift"

include/RunTime.h

@@ -10,12 +10,6 @@
 
 #include <string>
 
-// Defaults
-#define DEFAULT_CONFIG_PATH "~/.OpenRaider"
-#define DEFAULT_CONFIG_FILE "OpenRaider.ini"
-#define DEFAULT_WIDTH 1280
-#define DEFAULT_HEIGHT 720
-
 /*!
  * \brief Main Game Singleton
  */

include/config.h.in

@@ -8,9 +8,15 @@
 #ifndef _CONFIG_H_
 #define _CONFIG_H_
 
-extern const char *VERSION;
-extern const char *VERSION_SHORT;
-extern const char *BUILD_HOST;
+extern const unsigned int DEFAULT_WIDTH;
+extern const unsigned int DEFAULT_HEIGHT;
+
+extern const char* VERSION;
+extern const char* VERSION_SHORT;
+extern const char* BUILD_HOST;
+extern const char* DEFAULT_CONFIG_PATH;
+extern const char* DEFAULT_CONFIG_FILE;
+extern const char* INSTALL_PREFIX;
 
 #cmakedefine USING_AL
 #cmakedefine USING_PNG

src/CMakeLists.txt

@@ -272,12 +272,37 @@ endif (APPLE)
 
 #################################################################
 
-if (NOT APPLE)
-    # Install binary
-    install (TARGETS OpenRaider
-        RUNTIME DESTINATION bin
+# Install rules
+if (APPLE)
+    # We want to install to /Applications by default, not /usr
+    set (OR_INSTALL_PREFIX "/" CACHE PATH "Prefix prepended to
+install directories")
+    set (CMAKE_INSTALL_PREFIX "${OR_INSTALL_PREFIX}" CACHE INTERNAL "Prefix
+prepended to install directories" FORCE)
+
+    # Only the App Bundle is required on OS X
+    install (TARGETS OpenRaider BUNDLE DESTINATION Applications)
+elseif (NOT WIN32)
+    # We need a special config file for this install method
+    configure_file (
+        "${PROJECT_SOURCE_DIR}/data/Unix.in"   
+        "${PROJECT_BINARY_DIR}/Unix.ini"
     )
-endif (NOT APPLE)
+
+    # Executable
+    install (TARGETS OpenRaider RUNTIME DESTINATION bin)
+
+    # Config file
+    install (FILES "${PROJECT_BINARY_DIR}/Unix.ini"
+        DESTINATION etc
+        RENAME "OpenRaider.ini")
+
+    # Data files
+    install (FILES "${PROJECT_SOURCE_DIR}/data/font.pc"
+                    "${PROJECT_SOURCE_DIR}/data/splash.tga"
+                    "${PROJECT_SOURCE_DIR}/data/test.ttf"
+        DESTINATION "share/OpenRaider")
+endif (APPLE)
 
 #################################################################
 

src/config.cpp.in

@@ -7,9 +7,18 @@
 
 #include "global.h"
 
-const char *VERSION = "OpenRaider-@OpenRaider_VERSION_MAJOR@.@OpenRaider_VERSION_MINOR@.@OpenRaider_VERSION_MICRO@@OpenRaider_VERSION_RELEASE@ (@CMAKE_BUILD_TYPE@)";
+const unsigned int DEFAULT_WIDTH = 1280;
+const unsigned int DEFAULT_HEIGHT = 720;
 
-const char *VERSION_SHORT = "OpenRaider-@OpenRaider_VERSION_MAJOR@.@OpenRaider_VERSION_MINOR@.@OpenRaider_VERSION_MICRO@@OpenRaider_VERSION_RELEASE@";
+const char* VERSION = "OpenRaider-@OpenRaider_VERSION_MAJOR@.@OpenRaider_VERSION_MINOR@.@OpenRaider_VERSION_MICRO@@OpenRaider_VERSION_RELEASE@ (@CMAKE_BUILD_TYPE@)";
 
-const char *BUILD_HOST = "@OpenRaider_BUILD_HOST@ @OpenRaider_HOSTNAME@";
+const char* VERSION_SHORT = "OpenRaider-@OpenRaider_VERSION_MAJOR@.@OpenRaider_VERSION_MINOR@.@OpenRaider_VERSION_MICRO@@OpenRaider_VERSION_RELEASE@";
+
+const char* BUILD_HOST = "@OpenRaider_BUILD_HOST@ @OpenRaider_HOSTNAME@";
+
+const char* DEFAULT_CONFIG_PATH = "~/.OpenRaider";
+
+const char* DEFAULT_CONFIG_FILE = "OpenRaider.ini";
+
+const char* INSTALL_PREFIX = "@CMAKE_INSTALL_PREFIX@";
 

src/main.cpp

@@ -151,7 +151,14 @@ int main(int argc, char* argv[]) {
     // So we need to initialize some things before executing the config
     if (configFileToUse == "") {
         if (Command::executeFile(DEFAULT_CONFIG_FILE) != 0) {
-            Command::executeFile(DEFAULT_CONFIG_PATH "/" DEFAULT_CONFIG_FILE);
+            if (Command::executeFile(std::string(DEFAULT_CONFIG_PATH) + "/" + DEFAULT_CONFIG_FILE) != 0) {
+                std::string p = INSTALL_PREFIX;
+                if (p == "/")
+                    p += "etc/";
+                else
+                    p += "/etc/";
+                Command::executeFile(p + DEFAULT_CONFIG_FILE);
+            }
         }
     } else {
         Command::executeFile(configFileToUse);