Commit f2dc556d authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Contrib: various fixes to hope fixing projectM compilation

parent ce90177b
......@@ -2520,7 +2520,10 @@ glew: glew-$(GLEW_VERSION)-src.tgz
(patch -p0 < Patches/glew-win32.patch)
.glew: glew
(cd $<; $(HOSTCC) make && $(HOSTCC) GLEW_DEST=$(PREFIX) make install)
(cd $<; $(HOSTCC) CFLAGS="$(CFLAGS) -DGLEW_STATIC" make && $(HOSTCC) GLEW_DEST=$(PREFIX) make install)
ifdef HAVE_WIN32
rm -rf $(PREFIX)/lib/libglew32.dll*
endif
touch $@
CLEAN_FILE += .glew
......@@ -2542,7 +2545,10 @@ libprojectM: libprojectM-$(LIBPROJECTM_VERSION)-Source.tar.gz
cd $@; rm CMakeCache.txt
.libprojectM: libprojectM
(cd $<; $(HOSTCC) CPPFLAGS="$(CPPFLAGS)" cmake . -DCMAKE_TOOLCHAIN_FILE=../../toolchain.cmake -DINCLUDE-PROJECTM-LIBVISUAL:BOOL=OFF -DDISABLE_NATIVE_PRESETS:BOOL=ON -DUSE_FTGL:BOOL=OFF -DUSE_NATIVE_GLEW:BOOL=ON -DINCLUDE-PROJECTM-PULSEAUDIO:BOOL=OFF -DINCLUDE-PROJECTM-QT:BOOL=OFF -DBUILD_PROJECTM_STATIC:BOOL=ON -DCMAKE_INSTALL_PREFIX=$(PREFIX) && make install)
(cd $<; $(HOSTCC) CPPFLAGS="$(CPPFLAGS)" cmake . -DCMAKE_TOOLCHAIN_FILE=../../toolchain.cmake -DINCLUDE-PROJECTM-LIBVISUAL:BOOL=OFF -DDISABLE_NATIVE_PRESETS:BOOL=ON -DUSE_FTGL:BOOL=OFF -DINCLUDE-PROJECTM-PULSEAUDIO:BOOL=OFF -DINCLUDE-PROJECTM-QT:BOOL=OFF -DBUILD_PROJECTM_STATIC:BOOL=ON -DCMAKE_INSTALL_PREFIX=$(PREFIX) && make install)
ifdef HAVE_WIN32
(cd $<;cp Renderer/libRenderer.a MilkdropPresetFactory/libMilkdropPresetFactory.a $(PREFIX)/lib)
endif
touch $@
CLEAN_FILE += .libprojectM
......
......@@ -91,3 +91,86 @@ diff -ruN libprojectM/projectM.hpp libprojectM.new2/projectM.hpp
else(WIN32)
set (RESOURCE_PREFIX "share/projectM")
ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS -DUSE_THREADS)
--- libprojectM.new/CMakeLists.txt 2009-12-04 00:34:12.000000000 +0100
+++ libprojectM/CMakeLists.txt 2009-12-04 09:04:54.000000000 +0100
@@ -62,6 +62,8 @@
SET(PRESET_FACTORY_SOURCES ${PRESET_FACTORY_SOURCES} ${NativePresetFactory_SOURCE_DIR})
SET(PRESET_FACTORY_BINARY_DIR ${PRESET_FACTORY_BINARY_DIR} ${NativePresetFactory_BINARY_DIR})
SET(PRESET_FACTORY_LINK_TARGETS ${PRESET_FACTORY_LINK_TARGETS} NativePresetFactory)
+else (NOT DISABLE_NATIVE_PRESETS)
+ADD_DEFINITIONS(-DDISABLE_NATIVE_PRESETS)
endif(NOT DISABLE_NATIVE_PRESETS)
if (NOT DISABLE_MILKDROP_PRESETS)
@@ -114,6 +116,7 @@
endif(COMMAND cmake_policy)
if (BUILD_PROJECTM_STATIC)
+ADD_DEFINITIONS(-DGLEW_STATIC)
ADD_LIBRARY(projectM STATIC ${projectM_SOURCES})
else(BUILD_PROJECTM_STATIC)
ADD_LIBRARY(projectM SHARED ${projectM_SOURCES})
--- libprojectM.new/libprojectM.pc.in 2009-12-04 00:33:48.000000000 +0100
+++ libprojectM/libprojectM.pc.in 2009-12-04 08:59:27.000000000 +0100
@@ -9,5 +9,5 @@
Version: 2.0.0
Description: projectM - OpenGL Milkdrop
Requires:
-Libs: -L${libdir} -lprojectM
+Libs: -L${libdir} -lprojectM -lglu32 -lglew32 -lopengl32
Cflags: -I${includedir}
--- libprojectM/libprojectM.pc.in 2009-12-04 09:55:20.000000000 +0100
+++ libprojectM.new/libprojectM.pc.in 2009-12-04 09:54:55.000000000 +0100
@@ -9,5 +9,5 @@
Version: 2.0.0
Description: projectM - OpenGL Milkdrop
Requires:
-Libs: -L${libdir} -lprojectM -lglu32 -lglew32 -lopengl32
+Libs: -L${libdir} -lprojectM ${libdir}/libMilkdropPresetFactory.a ${libdir}/libRenderer.a ${libdir}/libprojectM.a -lglu32 -lglew32 -lopengl32
Cflags: -I${includedir}
diff -ruN libprojectM.new/libprojectM.pc.in libprojectM/libprojectM.pc.in
--- libprojectM.new/libprojectM.pc.in 2009-12-04 09:54:55.000000000 +0100
+++ libprojectM/libprojectM.pc.in 2009-12-04 10:15:18.000000000 +0100
@@ -1,6 +1,6 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@LIB_INSTALL_DIR@
+libdir=@CMAKE_INSTALL_PREFIX@/lib
includedir=@CMAKE_INSTALL_PREFIX@/include
pkgdatadir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@
sysconfdir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@
@@ -9,5 +9,5 @@
Version: 2.0.0
Description: projectM - OpenGL Milkdrop
Requires:
-Libs: -L${libdir} -lprojectM ${libdir}/libMilkdropPresetFactory.a ${libdir}/libRenderer.a ${libdir}/libprojectM.a -lglu32 -lglew32 -lopengl32
+Libs: -L${libdir} -lprojectM -lMilkdropPresetFactory -lRenderer -lglu32 -lglew32 -lopengl32
Cflags: -I${includedir}
diff -ruN libprojectM.new/MilkdropPresetFactory/CMakeLists.txt libprojectM/MilkdropPresetFactory/CMakeLists.txt
--- libprojectM.new/MilkdropPresetFactory/CMakeLists.txt 2009-12-01 07:38:42.000000000 +0100
+++ libprojectM/MilkdropPresetFactory/CMakeLists.txt 2009-12-04 10:26:42.000000000 +0100
@@ -5,7 +5,11 @@
cmake_policy(SET CMP0003 NEW)
endif(COMMAND cmake_policy)
-SET(MilkdropPresetFactory_SOURCES BuiltinFuncs.cpp Func.cpp MilkdropPreset.cpp Param.hpp PresetFrameIO.cpp CustomShape.cpp Eval.cpp MilkdropPresetFactory.cpp PerPixelEqn.cpp BuiltinParams.cpp InitCond.cpp Parser.cpp CustomWave.cpp Expr.cpp PerPointEqn.cpp Param.cpp PerFrameEqn.cpp IdlePreset.cpp)
+SET(MilkdropPresetFactory_SOURCES BuiltinFuncs.cpp Func.cpp MilkdropPreset.cpp
+ Param.hpp PresetFrameIO.cpp CustomShape.cpp Eval.cpp
+ MilkdropPresetFactory.cpp PerPixelEqn.cpp BuiltinParams.cpp
+ InitCond.cpp Parser.cpp CustomWave.cpp Expr.cpp PerPointEqn.cpp
+ Param.cpp PerFrameEqn.cpp IdlePreset.cpp ../PresetFactory.cpp )
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
diff -ruN libprojectM.new/Renderer/Renderer.cpp libprojectM/Renderer/Renderer.cpp
--- libprojectM.new/Renderer/Renderer.cpp 2009-12-01 07:38:42.000000000 +0100
+++ libprojectM/Renderer/Renderer.cpp 2009-12-04 10:21:38.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();
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment