diff --git a/src/projectM-engine/CMakeLists.txt b/src/projectM-engine/CMakeLists.txt index afa083827..cebdba945 100644 --- a/src/projectM-engine/CMakeLists.txt +++ b/src/projectM-engine/CMakeLists.txt @@ -9,7 +9,7 @@ ConfigFile.cpp IdlePreset.cpp TextureManager.cpp image_DXT.c image_helper.c SOI SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.00 SOVERSION 2) -ADD_DEFINITIONS(-DLINUX -DUSE_FBO -DSTBI_NO_DDS) +ADD_DEFINITIONS(-DLINUX -DUSE_FBO -DSTBI_NO_DDS -DUSE_THREADS) ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"") FIND_PACKAGE(OpenGL) diff --git a/src/projectM-engine/projectM.cpp b/src/projectM-engine/projectM.cpp index 596a7d76f..3fecf5372 100755 --- a/src/projectM-engine/projectM.cpp +++ b/src/projectM-engine/projectM.cpp @@ -173,11 +173,11 @@ void projectM::readConfig (const std::string & configFile ) _settings.smoothPresetDuration = config.read ( "Smooth Preset Duration", config.read("Smooth Transition Duration", 10)); _settings.presetDuration = config.read ( "Preset Duration", 15 ); - _settings.presetURL = config.read ( "Preset Path", "/share/projectM/presets" ); + _settings.presetURL = config.read ( "Preset Path", CMAKE_INSTALL_PREFIX "/share/projectM/presets" ); _settings.titleFontURL = config.read - ( "Title Font", "/share/projectM/fonts/Vera.ttf" ); + ( "Title Font", CMAKE_INSTALL_PREFIX "/share/projectM/fonts/Vera.ttf" ); _settings.menuFontURL = config.read - ( "Menu Font", "/share/projectM/fonts/VeraMono.ttf" ); + ( "Menu Font", CMAKE_INSTALL_PREFIX "/share/projectM/fonts/VeraMono.ttf" ); _settings.shuffleEnabled = config.read ( "Shuffle Enabled", true); _settings.easterEgg = config.read ( "Easter Egg Parameter", 0.0);