Add default paths for presets and textures and make them configurable via CMake.

Author: kblaschke

CMakeLists.txt

@@ -22,6 +22,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 set(PROJECTM_LINKAGE "shared" CACHE STRING "Set to either shared or static to specify how libprojectM should be linked. Defaults to shared.")
 set(SDL2_LINKAGE "shared" CACHE STRING "Set to either shared or static to specify how libSDL2 should be linked. Defaults to shared.")
 
+set(DEFAULT_PRESETS_PATH "\${application.dir}/presets" CACHE STRING "Default presets path in the configuration file.")
+set(DEFAULT_TEXTURES_PATH "\${application.dir}/textures" CACHE STRING "Default textures path in the configuration file.")
+
 if(NOT PROJECTM_LINKAGE STREQUAL "shared" AND NOT PROJECTM_LINKAGE STREQUAL "static")
     message(FATAL_ERROR "Invalid libprojectM linkage provided in PROJECTM_LINKAGE: \"${PROJECTM_LINKAGE}\".\n"
                         "Please specify either \"shared\" or \"static\"."

src/resources/projectMSDL.properties.in

@@ -32,11 +32,11 @@ window.waitForVerticalSync = true
 ### projectM settings
 
 # Path where projectMSDL will search for presets and textures. The directory will be searched recursively.
-projectM.presetPath = @DEFAULT_PRESET_PATH@
+projectM.presetPath = @DEFAULT_PRESETS_PATH@
 
 # Optional path where projectMSDL will search for additional textures. The directory will be searched recursively.
 # Note that textures found under "presetPath" will override textures in the texturePath dir.
-#projectM.texturePath =
+projectM.texturePath = @DEFAULT_TEXTURES_PATH@
 
 # If true, displays the built-in projectM logo preset on startup.
 projectM.enableSplash = false