From b6da7357083701b813c52fdc0232c636c503fcea Mon Sep 17 00:00:00 2001 From: psperl Date: Wed, 13 Jun 2007 02:48:52 +0000 Subject: [PATCH] Updates to linux build system git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@155 6778bc44-b910-0410-a7a0-be141de4315d --- src/projectM-engine/CMakeLists.txt | 18 ++++++++++++------ src/projectM-engine/config | 22 ++++++++++++++++++++++ src/projectM-engine/fonts | 1 + src/projectM-engine/presets | 1 + 4 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 src/projectM-engine/config create mode 120000 src/projectM-engine/fonts create mode 120000 src/projectM-engine/presets diff --git a/src/projectM-engine/CMakeLists.txt b/src/projectM-engine/CMakeLists.txt index 4386a21b5..c2781620a 100644 --- a/src/projectM-engine/CMakeLists.txt +++ b/src/projectM-engine/CMakeLists.txt @@ -1,9 +1,15 @@ PROJECT(projectM) ADD_LIBRARY(projectM SHARED projectM.cpp projectM.h pbuffer.cpp pbuffer.h InitCond.cpp InitCond.h console_interface.cpp Expr.cpp PCM.cpp Parser.cpp Preset.cpp common.h BeatDetect.cpp PCM.h PerPixelEqn.cpp Eval.h SplayTree.cpp Param.cpp CustomWave.cpp CustomShape.h CustomShape.cpp Param.h CustomWave.h BeatDetect.h Preset.h menu.cpp console_interface.h Func.h Func.cpp Eval.cpp wipemalloc.h browser.cpp builtin_funcs.cpp PerFrameEqn.cpp PerPointEqn.cpp editor.cpp fftsg.cpp glConsole.cpp CValue.h Expr.h timer.cpp wipemalloc.cpp PerFrameEqn.h PerPixelEqn.h PerPointEqn.h browser.h builtin_funcs.h compare.h editor.h event.h fatal.h SplayTree.h fftsg.h glConsole.h menu.h timer.h SplayNode.cpp SplayNode.h) -ADD_DEFINITIONS(-DLINUX -DDEBUG -DUSE_FTGL -DFBO) -INCLUDE (${CMAKE_ROOT}/Modules/FindOpenGL.cmake) -INCLUDE_DIRECTORIES(/usr/include/freetype2/) -TARGET_LINK_LIBRARIES(projectM GL GLEW ftgl m) -install(TARGETS projectM DESTINATION lib) -install(FILES projectM.h pbuffer.h PCM.h BeatDetect.h Preset.h event.h console_interface.h dlldefs.h fatal.h PCM.h DESTINATION include/libprojectM) \ No newline at end of file +ADD_DEFINITIONS(-DLINUX -DUSE_FTGL -DFBO) +FIND_PACKAGE(OpenGL) +INCLUDE_DIRECTORIES(/usr/include/freetype2/) +TARGET_LINK_LIBRARIES(projectM GLEW ftgl m) + +INSTALL(TARGETS projectM DESTINATION lib) +INSTALL(FILES projectM.h pbuffer.h PCM.h BeatDetect.h Preset.h event.h console_interface.h dlldefs.h fatal.h PCM.h DESTINATION include/libprojectM) +INSTALL(FILES config DESTINATION share/projectM) +FILE(GLOB presets "presets/*.milk") +INSTALL(FILES ${presets} DESTINATION share/projectM/presets) +FILE(GLOB fonts "fonts/*.ttf") +INSTALL(FILES ${fonts} DESTINATION share/projectM/fonts) \ No newline at end of file diff --git a/src/projectM-engine/config b/src/projectM-engine/config new file mode 100644 index 000000000..bf066ae2f --- /dev/null +++ b/src/projectM-engine/config @@ -0,0 +1,22 @@ +projectM Config file (ONLY CHANGE THE NUMBERS!!!!!!) +------------------------------------------------------ +Texture Size (Must be power of 2) [256,512,1024,2048, etc] +512 +Grid X Dimension (Higher is Better but much slower) 12-60 +32 +Grid Y Dimension (Higher is Better but much slower) 8-45 +24 +Windowed Width (Initial window width) +512 +Windowed Height (Initial window width) +512 +Fullscreen Width (set to your native screen resolution) +1024 +Fullscreen Height (set to your native screen resolution) +768 +FPS (Higher the Better) 30-90 is realisitc +35 +Fullscreen on Startup (1=yes, 0=no) +0 +X Server to Display projectM default is ":0.0" +:0.0 diff --git a/src/projectM-engine/fonts b/src/projectM-engine/fonts new file mode 120000 index 000000000..8b289e24f --- /dev/null +++ b/src/projectM-engine/fonts @@ -0,0 +1 @@ +../../fonts \ No newline at end of file diff --git a/src/projectM-engine/presets b/src/projectM-engine/presets new file mode 120000 index 000000000..840871fb9 --- /dev/null +++ b/src/projectM-engine/presets @@ -0,0 +1 @@ +../../presets \ No newline at end of file