PJS: Kierens path patch

git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@714 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
psperl
2007-11-30 02:30:43 +00:00
parent d2e2640849
commit d3e48b48bb
2 changed files with 4 additions and 3 deletions

View File

@ -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)

View File

@ -124,10 +124,10 @@ void projectM::readConfig ( std::string config_file )
presetDuration = config.read<int> ( "Preset Duration", 15 );
presetURL = config.read<string> ( "Preset Path", "/usr/share/projectM/presets" );
presetURL = config.read<string> ( "Preset Path", CMAKE_INSTALL_PREFIX "/share/projectM/presets" );
title_fontURL = config.read<string> ( "Title Font", "/usr/share/projectM/fonts/Vera.ttf" );
menu_fontURL = config.read<string> ( "Menu Font", "/usr/share/projectM/fonts/VeraMono.ttf" );
title_fontURL = config.read<string> ( "Title Font", CMAKE_INSTALL_PREFIX "/share/projectM/fonts/Vera.ttf" );
menu_fontURL = config.read<string> ( "Menu Font", CMAKE_INSTALL_PREFIX "/share/projectM/fonts/VeraMono.ttf" );
projectM_init ( gx, gy, fps, texsize, wvw, wvh );