Skip to content

Commit 9a68e00

Browse files
committed
Renderer needs CoreFoundation, libprojectM needs openGL
1 parent ad3233b commit 9a68e00

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/libprojectM/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ if(BUILD_PROJECTM_STATIC)
206206
${COREFOUNDATION_LIBRARIES}
207207
${OPENGL_LIBRARIES}
208208
dl
209-
${OPENGL_LIBRARIES}
210209
)
211210
else(BUILD_PROJECTM_STATIC)
212211
TARGET_LINK_LIBRARIES(projectM Renderer
@@ -216,10 +215,8 @@ else(BUILD_PROJECTM_STATIC)
216215
${GLEW_LIBRARY}
217216
${FTGL_LINK_TARGETS}
218217
${MATH_LIBRARIES}
219-
${COREFOUNDATION_LIBRARIES}
220218
${OPENGL_LIBRARIES}
221219
dl
222-
${OPENGL_LIBRARIES}
223220
)
224221
endif(BUILD_PROJECTM_STATIC)
225222

src/libprojectM/Renderer/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ else(MSVC)
4040
SET (MATH_LIBRARIES m)
4141
endif(MSVC)
4242

43+
if (APPLE)
44+
FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation)
45+
else (APPLE)
46+
set(COREFOUNDATION_LIBRARY )
47+
endif(APPLE)
48+
4349
INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR})
4450

4551
ADD_LIBRARY(Renderer STATIC ${Renderer_SOURCES})
@@ -50,5 +56,6 @@ TARGET_LINK_LIBRARIES(Renderer ${MATH_LIBRARIES}
5056
${IMAGE_LINK_TARGETS}
5157
${CG_LINK_TARGETS}
5258
${FREETYPE2_LIBRARIES}
59+
${COREFOUNDATION_LIBRARY}
5360
)
5461
set_target_properties(Renderer PROPERTIES COMPILE_FLAGS "-Wno-parentheses")

0 commit comments

Comments
 (0)