Author: arvenil Date: Mon Mar 31 20:27:59 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- up to 1.1
---- Files affected:
SOURCES:
libprojectM-static.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/libprojectM-static.patch
diff -u SOURCES/libprojectM-static.patch:1.1
SOURCES/libprojectM-static.patch:1.2
--- SOURCES/libprojectM-static.patch:1.1 Thu Oct 11 22:31:10 2007
+++ SOURCES/libprojectM-static.patch Mon Mar 31 22:27:54 2008
@@ -1,5 +1,5 @@
---- libprojectM-1.0/CMakeLists.txt 2007-10-10 14:47:14.000000000 +0000
-+++ libprojectM-1.0/CMakeLists.txt 2007-10-11 17:57:31.000000000 +0000
+--- libprojectM-1.1/CMakeLists.txt 2008-03-30 19:53:59.000000000 +0000
++++ libprojectM-1.1/CMakeLists.txt 2008-03-31 21:41:02.000000000 +0000
@@ -1,5 +1,13 @@
PROJECT(projectM)
-ADD_LIBRARY(projectM SHARED projectM.cpp FBO.cpp InitCond.cpp
@@ -9,39 +9,41 @@
+ timer.cpp wipemalloc.cpp
+BuiltinFuncs.cpp BuiltinParams.cpp Renderer.cpp
+PresetLoader.cpp PresetChooser.cpp PresetFrameIO.cpp PresetMerge.cpp
-+ConfigFile.cpp IdlePreset.cpp TextureManager.cpp MoodBar.cpp image_DXT.c
image_helper.c SOIL.c stb_image.c )
++ConfigFile.cpp IdlePreset.cpp TextureManager.cpp image_DXT.c image_helper.c
SOIL.c stb_image_aug.c TimeKeeper.cpp)
+
+ADD_LIBRARY(projectM-static STATIC projectM.cpp FBO.cpp InitCond.cpp
Expr.cpp PCM.cpp Parser.cpp Preset.cpp BeatDetect.cpp PerPixelEqn.cpp
Param.cpp CustomWave.cpp CustomShape.cpp
Func.cpp Eval.cpp PerFrameEqn.cpp PerPointEqn.cpp fftsg.cpp KeyHandler.cpp
timer.cpp wipemalloc.cpp
-@@ -9,20 +17,22 @@
-
- OPTION(USE_FTGL "Use FTGL for on-screen fonts" ON)
-
-+SET_TARGET_PROPERTIES(projectM-shared projectM-static PROPERTIES OUTPUT_NAME
projectM)
-+
- ADD_DEFINITIONS(-DLINUX -DUSE_FBO)
-
- FIND_PACKAGE(OpenGL)
-
- INCLUDE(FindPkgConfig.cmake)
+@@ -7,7 +15,7 @@
+ PresetLoader.cpp PresetChooser.cpp PresetFrameIO.cpp PresetMerge.cpp
+ ConfigFile.cpp IdlePreset.cpp TextureManager.cpp image_DXT.c image_helper.c
SOIL.c stb_image_aug.c TimeKeeper.cpp)
+
+-SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.00 SOVERSION 2)
++SET_TARGET_PROPERTIES(projectM-shared projectM-static PROPERTIES VERSION 2.00
SOVERSION 2 OUTPUT_NAME projectM)
+
+ ADD_DEFINITIONS(-DLINUX -DUSE_FBO -DSTBI_NO_DDS -DUSE_THREADS)
+ ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"")
+@@ -24,7 +32,7 @@
+ OPTION(USE_FTGL "Use FTGL for on-screen fonts (Warning: NOT found on
your system! Turning this on will probably bust the compilation.)" OFF)
+ endif(FTGL_FOUND)
-TARGET_LINK_LIBRARIES(projectM GLEW m)
+TARGET_LINK_LIBRARIES(projectM-shared projectM-static GLEW m)
IF(USE_FTGL)
- pkg_search_module (FTGL ftgl)
+ if (FTGL_FOUND)
+@@ -36,7 +44,7 @@
ADD_DEFINITIONS(-DUSE_FTGL)
INCLUDE_DIRECTORIES(${FTGL_INCLUDE_DIRS})
LINK_DIRECTORIES(${FTGL_LIBRARY_DIRS} "./")
- TARGET_LINK_LIBRARIES(projectM GLEW m ftgl freetype)
+ TARGET_LINK_LIBRARIES(projectM-shared projectM-static GLEW m ftgl
freetype)
- ENDIF(USE_FTGL)
-
- CONFIGURE_FILE("libprojectM.pc.in" "libprojectM.pc" @ONLY)
-@@ -35,4 +45,4 @@
- INSTALL(FILES "${CMAKE_BINARY_DIR}/libprojectM.pc" DESTINATION
${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+ ELSE (USE_FTGL)
+ IF (FTGL_FOUND)
+ MESSAGE("Warning: FTGL font support was detected but NOT
enabled. You can enable it by setting USE_FTGL=true")
+@@ -55,4 +63,4 @@
+ INSTALL(FILES "${CMAKE_BINARY_DIR}/libprojectM.pc" DESTINATION
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
INSTALL(FILES config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM)
INSTALL(FILES projectM.hpp event.h dlldefs.h fatal.h PresetFrameIO.hpp
PCM.hpp DESTINATION include/libprojectM)
-INSTALL(TARGETS projectM DESTINATION lib)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/libprojectM-static.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
