Configurable data dir at compile time (fixes #20)

Author: cxong

CMakeLists.txt

@@ -1,5 +1,8 @@
 project(FallingTime)
 cmake_minimum_required(VERSION 2.8.10)
+if("${CMAKE_VERSION}" VERSION_GREATER 3.1)
+	cmake_policy(SET CMP0054 NEW)
+endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
 
@@ -78,6 +81,11 @@ ELSE()
 	include_directories(${SDL2TTF_INCLUDE_DIR})
 ENDIF()
 
+set(DATA_DIR "./data/" CACHE STRING "Data directory")
+message("Data dir is ${DATA_DIR}")
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sys_config.h.cmake ${CMAKE_SOURCE_DIR}/sys_config.h)
+SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sys_config.h PROPERTIES GENERATED TRUE)
+
 include_directories(.)
 include_directories(chipmunk/include)
 

bg.c

@@ -26,6 +26,7 @@
 #include "draw.h"
 #include "init.h"
 #include "main.h"
+#include "sys_config.h"
 #include "utils.h"
 
 #define ICICLE_WIDTH 58
@@ -155,7 +156,7 @@ static void DrawParticleScroll(
 bool BackgroundsLoad(Backgrounds* bg)
 {
 #define LOAD_TEX(_t, _filename)\
-	_t = LoadTex("data/graphics/" _filename);\
+	_t = LoadTex(DATA_DIR "graphics/" _filename);\
 	if (_t.T == NULL)\
 	{\
 		return false;\

box.c

@@ -32,6 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "gap.h"
 #include "main.h"
 #include "space.h"
+#include "sys_config.h"
 #include "utils.h"
 
 #define BLOCK_SPRITE_HEIGHT 15
@@ -95,7 +96,7 @@ bool BoxTexesLoad(void)
 	for (int i = 0; i < 6; i++)
 	{
 		char buf[256];
-		sprintf(buf, "data/graphics/floor%d.png", i);
+		sprintf(buf, DATA_DIR "graphics/floor%d.png", i);
 		BoxTexes[i] = LoadTex(buf);
 		if (BoxTexes[i].T == NULL)
 		{

init.c

@@ -35,6 +35,7 @@
 #include "player.h"
 #include "space.h"
 #include "sound.h"
+#include "sys_config.h"
 #include "title.h"
 
 SDL_Surface *icon = NULL;
@@ -101,7 +102,7 @@ void Initialize(bool* Continue, bool* Error)
 	else
 		printf("TTF_Init succeeded\n");
 
-	icon = IMG_Load("data/graphics/icon.png");
+	icon = IMG_Load(DATA_DIR "graphics/icon.png");
 	if (icon == NULL)
 	{
 		*Continue = false;  *Error = true;
@@ -112,7 +113,7 @@ void Initialize(bool* Continue, bool* Error)
 	SDL_SetWindowIcon(Window, icon);
 
 #define LOAD_IMG(_t, _path)\
-	_t = LoadTex("data/graphics/" _path);\
+	_t = LoadTex(DATA_DIR "graphics/" _path);\
 	if (_t.T == NULL)\
 	{\
 		*Continue = false;  *Error = true;\
@@ -125,7 +126,7 @@ void Initialize(bool* Continue, bool* Error)
 	LOAD_IMG(PickupTex, "eggplant.png");
 
 #define LOAD_ANIM(_anim, _path, _w, _h, _fps)\
-	if (!AnimationLoad(&(_anim), "data/graphics/" _path, (_w), (_h), (_fps)))\
+	if (!AnimationLoad(&(_anim), DATA_DIR "graphics/" _path, (_w), (_h), (_fps)))\
 	{\
 		*Continue = false;  *Error = true;\
 		return;\
@@ -151,7 +152,7 @@ void Initialize(bool* Continue, bool* Error)
 	}
 
 #define LOAD_SOUND(_sound, _path)\
-	_sound = Mix_LoadWAV("data/sounds/" _path);\
+	_sound = Mix_LoadWAV(DATA_DIR "sounds/" _path);\
 	if (_sound == NULL)\
 	{\
 		*Continue = false;  *Error = true;\
@@ -166,7 +167,7 @@ void Initialize(bool* Continue, bool* Error)
 	LOAD_SOUND(SoundScore, "score.ogg");
 	SoundLoad();
 
-	music = Mix_LoadMUS("data/sounds/music.ogg");
+	music = Mix_LoadMUS(DATA_DIR "sounds/music.ogg");
 	if (music == NULL)
 	{
 		*Continue = false;  *Error = true;
@@ -176,7 +177,7 @@ void Initialize(bool* Continue, bool* Error)
 	}
 
 #define LOAD_FONT(_f, _file, _size)\
-	_f = TTF_OpenFont("data/" _file, _size);\
+	_f = TTF_OpenFont(DATA_DIR _file, _size);\
 	if (_f == NULL)\
 	{\
 		*Continue = false;  *Error = true;\

sound.c

@@ -3,6 +3,7 @@
 #include <math.h>
 
 #include "player.h"
+#include "sys_config.h"
 #include "utils.h"
 
 #define BOUNCE_SPEED_MAX_VOLUME 150.0f
@@ -22,7 +23,7 @@ Mix_Chunk *SoundPlayerCalls[MAX_PLAYERS];
 bool SoundLoad(void)
 {
 #define LOAD_SOUND(_sound, _path)\
-	_sound = Mix_LoadWAV("data/sounds/" _path);\
+	_sound = Mix_LoadWAV(DATA_DIR "sounds/" _path);\
 	if (_sound == NULL)\
 	{\
 		printf("Mix_LoadWAV failed: %s\n", SDL_GetError());\

sys_config.h

@@ -0,0 +1,3 @@
+#pragma once
+
+#define DATA_DIR "./datad/"

sys_config.h.cmake

@@ -0,0 +1,3 @@
+#pragma once
+
+#define DATA_DIR "@DATA_DIR@"

title.c

@@ -23,6 +23,7 @@
 #include <inttypes.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "SDL_image.h"
 
@@ -40,6 +41,7 @@
 #include "text.h"
 #include "game.h"
 #include "bg.h"
+#include "sys_config.h"
 #include "sys_specifics.h"
 #include "utils.h"
 
@@ -351,12 +353,12 @@ void ToTitleScreen(const bool start)
 
 bool TitleImagesLoad(void)
 {
-	if (!AnimationLoad(&TitleAnim, "data/graphics/anim.png", 169, 40, 12))
+	if (!AnimationLoad(&TitleAnim, DATA_DIR "graphics/anim.png", 169, 40, 12))
 	{
 		return false;
 	}
 	if (!AnimationLoad(
-		&GameOverAnim, "data/graphics/gameover.png", 131, 40, 3))
+		&GameOverAnim, DATA_DIR "graphics/gameover.png", 131, 40, 3))
 	{
 		return false;
 	}
@@ -372,15 +374,15 @@ bool TitleImagesLoad(void)
 	{
 		char buf[256];
 #ifdef __GCW0__
-		sprintf(buf, "data/graphics/gcw%d.png", i);
+		sprintf(buf, DATA_DIR "graphics/gcw%d.png", i);
 #else
 		if (i < numJoysticks)
 		{
-			strcpy(buf, "data/graphics/360.png");
+			strcpy(buf, DATA_DIR "graphics/360.png");
 		}
 		else
 		{
-			sprintf(buf, "data/graphics/keyboard%d.png", i - numJoysticks);
+			sprintf(buf, DATA_DIR "graphics/keyboard%d.png", i - numJoysticks);
 		}
 #endif
 		ControlTexes[i] = LoadTex(buf);
@@ -390,9 +392,9 @@ bool TitleImagesLoad(void)
 		}
 	}
 #ifdef __GCW0__
-	ControlTex0Analog = LoadTex("data/graphics/gcw0analog.png");
+	ControlTex0Analog = LoadTex(DATA_DIR "graphics/gcw0analog.png");
 	if (ControlTex0Analog.T == NULL) return false;
-	ControlTex0G = LoadTex("data/graphics/gcw0g.png");
+	ControlTex0G = LoadTex(DATA_DIR "graphics/gcw0g.png");
 	if (ControlTex0G.T == NULL) return false;
 #endif
 	return true;