Blob Blame History Raw
diff -rupN libprojectM-2.0.1.old/CMakeLists.txt libprojectM-2.0.1/CMakeLists.txt
--- libprojectM-2.0.1.old/CMakeLists.txt	2009-12-05 20:42:51.000000000 -0500
+++ libprojectM-2.0.1/CMakeLists.txt	2010-07-17 11:41:28.000000000 -0400
@@ -190,8 +190,6 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_D
 
 FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga")
 INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets)
-FILE(GLOB fonts "fonts/*.ttf")
-INSTALL(FILES ${fonts} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/fonts)
 INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM)
diff -rupN libprojectM-2.0.1.old/config.inp.in libprojectM-2.0.1/config.inp.in
--- libprojectM-2.0.1.old/config.inp.in	2009-12-05 20:42:51.000000000 -0500
+++ libprojectM-2.0.1/config.inp.in	2010-07-17 11:41:28.000000000 -0400
@@ -17,6 +17,6 @@ Hard Cut Sensitivity = 10       # Lower 
 Aspect Correction = true	# Custom Shape Aspect Correction
 
 Preset Path = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/presets # preset location
-Title Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/Vera.ttf
-Menu Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/VeraMono.ttf
+Title Font = @CMAKE_INSTALL_PREFIX@/share/fonts/bitstream-vera/Vera.ttf
+Menu Font = @CMAKE_INSTALL_PREFIX@/share/fonts/bitstream-vera/VeraMono.ttf
  
diff -rupN libprojectM-2.0.1.old/projectM.cpp libprojectM-2.0.1/projectM.cpp
--- libprojectM-2.0.1.old/projectM.cpp	2009-12-05 20:42:51.000000000 -0500
+++ libprojectM-2.0.1/projectM.cpp	2010-07-17 11:43:00.000000000 -0400
@@ -200,9 +200,9 @@ void projectM::readConfig (const std::st
 
     #ifdef LINUX
     _settings.titleFontURL = config.read<string>
-    ( "Title Font", CMAKE_INSTALL_PREFIX  "/share/projectM/fonts/Vera.ttf" );
+    ( "Title Font", CMAKE_INSTALL_PREFIX  "/share/fonts/bitstream-vera/Vera.ttf" );
     _settings.menuFontURL = config.read<string>
-    ( "Menu Font", CMAKE_INSTALL_PREFIX  "/share/projectM/fonts/VeraMono.ttf" );
+    ( "Menu Font", CMAKE_INSTALL_PREFIX  "/share/fonts/bitstream-vera/VeraMono.ttf" );
     #endif
 
     #ifdef WIN32