From d3e48b48bb491e30610869bc8a84d4e80e2bb258 Mon Sep 17 00:00:00 2001 From: psperl Date: Fri, 30 Nov 2007 02:30:43 +0000 Subject: [PATCH] PJS: Kierens path patch git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@714 6778bc44-b910-0410-a7a0-be141de4315d --- src/projectM-engine/CMakeLists.txt | 1 + src/projectM-engine/projectM.cpp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/projectM-engine/CMakeLists.txt b/src/projectM-engine/CMakeLists.txt index f9f719a27..214e87cc0 100644 --- a/src/projectM-engine/CMakeLists.txt +++ b/src/projectM-engine/CMakeLists.txt @@ -16,6 +16,7 @@ SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 1.02 SOVERSION 1) OPTION(USE_FTGL "Use FTGL for on-screen fonts" ON) ADD_DEFINITIONS(-DLINUX -DUSE_FBO -DSTBI_NO_DDS) +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 1a640f982..bbbb2b774 100755 --- a/src/projectM-engine/projectM.cpp +++ b/src/projectM-engine/projectM.cpp @@ -124,10 +124,10 @@ void projectM::readConfig ( std::string config_file ) presetDuration = config.read ( "Preset Duration", 15 ); - presetURL = config.read ( "Preset Path", "/usr/share/projectM/presets" ); + presetURL = config.read ( "Preset Path", CMAKE_INSTALL_PREFIX "/share/projectM/presets" ); - title_fontURL = config.read ( "Title Font", "/usr/share/projectM/fonts/Vera.ttf" ); - menu_fontURL = config.read ( "Menu Font", "/usr/share/projectM/fonts/VeraMono.ttf" ); + title_fontURL = config.read ( "Title Font", CMAKE_INSTALL_PREFIX "/share/projectM/fonts/Vera.ttf" ); + menu_fontURL = config.read ( "Menu Font", CMAKE_INSTALL_PREFIX "/share/projectM/fonts/VeraMono.ttf" ); projectM_init ( gx, gy, fps, texsize, wvw, wvh );