diff options
| author |   Eric Hameleers <alien@slackware.com> | 2010-03-18 09:55:15 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2010-03-18 09:55:15 +0000 |
| commit | cffade0a92b33e79cc936571ca7aacfe75ef7b8e (patch) | |
| tree | 0bb77dbe279ef3c663b58b8d1cc1e72e88e73e37 /vlc/build/projectM_static.patch | |
| parent | 9fc7183418dba1f17ffd86fa560915215ba015b3 (diff) | |
| download | asb-cffade0a92b33e79cc936571ca7aacfe75ef7b8e.tar.gz asb-cffade0a92b33e79cc936571ca7aacfe75ef7b8e.tar.xz | |
This version of the patch works!
Diffstat (limited to 'vlc/build/projectM_static.patch')
| -rw-r--r-- | vlc/build/projectM_static.patch | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/vlc/build/projectM_static.patch b/vlc/build/projectM_static.patch index 7356be41..5a6683fc 100644 --- a/vlc/build/projectM_static.patch +++ b/vlc/build/projectM_static.patch @@ -6,19 +6,22 @@ SET(PRESET_FACTORY_LINK_TARGETS ${PRESET_FACTORY_LINK_TARGETS} NativePresetFactory) -endif(NOT DISABLE_NATIVE_PRESETS) +else (NOT DISABLE_NATIVE_PRESETS) -+ADD_DEFINITIONS(-DDISABLE_NATIVE_PRESETS)endif(NOT DISABLE_NATIVE_PRESETS) ++ADD_DEFINITIONS(-DDISABLE_NATIVE_PRESETS) +endif (NOT DISABLE_NATIVE_PRESETS) if (NOT DISABLE_MILKDROP_PRESETS) add_subdirectory(MilkdropPresetFactory) -@@ -105,6 +107,7 @@ - endif(COMMAND cmake_policy) +--- projectM-2.0.1-Source/CMakeLists.txt.orig 2010-03-17 16:03:59.000000000 +0100 ++++ projectM-2.0.1-Source/CMakeLists.txt 2010-03-17 17:01:33.000000000 +0100 +@@ -60,7 +60,7 @@ + if (NOT DISABLE_MILKDROP_PRESETS) + add_subdirectory(MilkdropPresetFactory) + SET(PRESET_FACTORY_SOURCES ${PRESET_FACTORY_SOURCES} ${MilkdropPresetFactory_SOURCE_DIR}) +-SET(PRESET_FACTORY_BINARY_DIR ${PRESET_FACTORY_BINARY_DIR} ${MilkdropPrmaesetFactory_BINARY_DIR}) ++SET(PRESET_FACTORY_BINARY_DIR ${PRESET_FACTORY_BINARY_DIR} ${MilkdropPresetFactory_BINARY_DIR}) + SET(PRESET_FACTORY_LINK_TARGETS ${PRESET_FACTORY_LINK_TARGETS} MilkdropPresetFactory) + endif(NOT DISABLE_MILKDROP_PRESETS) - if (BUILD_PROJECTM_STATIC) -+ADD_DEFINITIONS(-DGLEW_STATIC) - ADD_LIBRARY(projectM STATIC ${projectM_SOURCES}) - else(BUILD_PROJECTM_STATIC) - ADD_LIBRARY(projectM SHARED ${projectM_SOURCES}) --- projectM-2.0.1-Source/MilkdropPresetFactory/CMakeLists.txt.orig 2009-12-06 02:42:51.000000000 +0100 +++ projectM-2.0.1-Source/MilkdropPresetFactory/CMakeLists.txt 2010-03-17 13:04:12.000000000 +0100 @@ -5,7 +5,7 @@ @@ -30,3 +33,14 @@ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") +--- projectM-2.0.1-Source/Renderer/Renderer.cpp.orig 2009-12-06 02:42:51.000000000 +0100 ++++ projectM-2.0.1-Source/Renderer/Renderer.cpp 2010-03-18 09:05:05.000000000 +0100 +@@ -222,7 +222,7 @@ + glTranslatef(-0.5, -0.5, 0); + + // When console refreshes, there is a chance the preset has been changed by the user +- refreshConsole(); ++ //refreshConsole(); + draw_title_to_screen(false); + if (this->showhelp % 2) + draw_help(); |