Pass data directory to the game

clintbellanger · Dec 22, 2011 · 1f4cbd1 · 1f4cbd1
1 parent e2e054e
commit 1f4cbd1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,6 +26,8 @@ endif()
 set(BINDIR  "games"             CACHE STRING "where to install game binary")
 set(DATADIR "share/games/flare" CACHE STRING "where to install game data")
 
+add_definitions(-DDATA_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${DATADIR}")
+
 # Detect missing dependencies
 
 Find_Package (SDL REQUIRED)

diff --git a/src/Settings.cpp b/src/Settings.cpp
@@ -171,6 +171,11 @@ void setPaths() {
 			pathtest = eatFirstString(pathlist,':');
 		}
 	}
+
+#if defined DATA_INSTALL_DIR
+	PATH_DATA = DATA_INSTALL_DIR "/";
+	if (dirExists(PATH_DATA)) return; // NOTE: early exit
+#endif
 
 	// check /usr/local/share/flare/ and /usr/share/flare/ next
 	PATH_DATA = "/usr/local/share/" + engine_folder + "/";