[vlc-commits] contrib: projectM: Don't forcibly add -fPIC when targeting windows

[Martin Storsjö]

vlc | branch: master | Martin Storsjö <martin at martin.st> | Thu Dec 14 09:17:39 2017 +0200| [bfc7b3493e7651401625d873b9d05d050fc9c71b] | committer: Martin Storsjö

contrib: projectM: Don't forcibly add -fPIC when targeting windows

This fixes compilation with clang.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bfc7b3493e7651401625d873b9d05d050fc9c71b
---

 contrib/src/projectM/win32.patch | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/contrib/src/projectM/win32.patch b/contrib/src/projectM/win32.patch
index dfbf425d5c..f1ed8e9d54 100644
--- a/contrib/src/projectM/win32.patch
+++ b/contrib/src/projectM/win32.patch
@@ -225,3 +225,40 @@ diff -ruN libprojectM/Renderer/TextureManager.cpp libprojectM.new/Renderer/Textu
    bool running;
  
    Pipeline* currentPipe;
+diff -ruN projectM/MilkdropPresetFactory/CMakeLists.txt projectM.new/MilkdropPresetFactory/CMakeLists.txt
+--- projectM/MilkdropPresetFactory/CMakeLists.txt	2018-02-26 00:24:12.274797430 +0200
++++ projectM.new/MilkdropPresetFactory/CMakeLists.txt	2018-02-26 00:24:28.786407718 +0200
+@@ -11,8 +11,6 @@
+         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")
+-
+ INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR} ${Renderer_SOURCE_DIR})
+ LINK_DIRECTORIES(${projectM_BINARY_DIR} ${Renderer_BINARY_DIR})
+ 
+diff -ruN projectM/NativePresetFactory/CMakeLists.txt projectM.new/NativePresetFactory/CMakeLists.txt
+--- projectM/NativePresetFactory/CMakeLists.txt	2009-12-06 03:42:51.000000000 +0200
++++ projectM.new/NativePresetFactory/CMakeLists.txt	2018-02-26 00:24:36.774219188 +0200
+@@ -7,8 +7,6 @@
+ 
+ SET(NativePresetFactory_SOURCES NativePresetFactory.cpp)
+ 
+-SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+- 
+ INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR} ${Renderer_SOURCE_DIR})
+ ADD_LIBRARY(NativePresetFactory STATIC ${NativePresetFactory_SOURCES})
+ SET_TARGET_PROPERTIES(NativePresetFactory PROPERTIES VERSION 2.00 SOVERSION 2)
+diff -ruN projectM/Renderer/CMakeLists.txt projectM.new/Renderer/CMakeLists.txt
+--- projectM/Renderer/CMakeLists.txt	2009-12-06 03:42:51.000000000 +0200
++++ projectM.new/Renderer/CMakeLists.txt	2018-02-26 00:24:46.257995347 +0200
+@@ -7,9 +7,6 @@
+ Filters.cpp PerlinNoise.cpp PipelineContext.cpp  Renderable.cpp BeatDetect.cpp Shader.cpp TextureManager.cpp VideoEcho.cpp 
+ RenderItemDistanceMetric.cpp RenderItemMatcher.cpp ${SOIL_SOURCES})
+ 
+-SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+-SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+-
+ INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR})
+ ADD_LIBRARY(Renderer STATIC ${Renderer_SOURCES})
+ SET_TARGET_PROPERTIES(Renderer PROPERTIES VERSION 2.00 SOVERSION 2)