From d7d140ea44bc514d8535178be16935208858b09a Mon Sep 17 00:00:00 2001 From: w1z7ard Date: Fri, 2 May 2008 00:26:55 +0000 Subject: [PATCH] added OPENGL_INCLUDE_DIR where applicable. evil carbon hack. git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@981 6778bc44-b910-0410-a7a0-be141de4315d --- src/projectM-engine/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/projectM-engine/CMakeLists.txt b/src/projectM-engine/CMakeLists.txt index 5c436c56a..f62ddf0d6 100644 --- a/src/projectM-engine/CMakeLists.txt +++ b/src/projectM-engine/CMakeLists.txt @@ -36,7 +36,7 @@ ADD_LIBRARY(projectM SHARED ${projectM_SOURCES}) SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.00 SOVERSION 2) if (APPLE) -ADD_DEFINITIONS(-DMACOS -DSTBI_NO_DDS) +ADD_DEFINITIONS(-DMACOS -DSTBI_NO_DDS -DUSE_THREADS) else (APPLE) ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS -DUSE_THREADS) endif(APPLE) @@ -62,6 +62,7 @@ endif(FTGL_FOUND) TARGET_LINK_LIBRARIES(projectM GLEW ${OPENGL_LIBRARIES} m ${IMAGE_LOADING_LIBS}) + IF(USE_FTGL) if (FTGL_FOUND) MESSAGE(STATUS "[projectM] FTGL font support was detected and enabled.") @@ -70,7 +71,7 @@ IF(USE_FTGL) "[projectM] Warning! FTGL has been enabled but not detected. Your compilation will probably break. Turn off FTGL support by setting USE_FTGL to false, or visit http://ftgl.wiki.sourceforge.net/ for help on installing FTGL.") endif (FTGL_FOUND) ADD_DEFINITIONS(-DUSE_FTGL) - INCLUDE_DIRECTORIES(${FTGL_INCLUDE_DIRS} ${CMAKE_INCLUDE_PATH}) + INCLUDE_DIRECTORIES(${FTGL_INCLUDE_DIRS} ${CMAKE_INCLUDE_PATH} ${OPENGL_INCLUDE_DIR}) LINK_DIRECTORIES(${FTGL_LIBRARY_DIRS} "./") TARGET_LINK_LIBRARIES(projectM GLEW m ftgl freetype) ELSE (USE_FTGL) @@ -79,7 +80,7 @@ ELSE (USE_FTGL) ELSE (FTGL_FOUND) MESSAGE(STATUS "[projectM] Warning: FTGL font support was not detected. Visit http://ftgl.wiki.sourceforge.net/ for help on installing FTGL.") ENDIF(FTGL_FOUND) - LINK_DIRECTORIES(${CMAKE_LIBRARY_PATH} "./") + LINK_DIRECTORIES(${CMAKE_LIBRARY_PATH} ${OPENGL_INCLUDE_DIR} /Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/Carbon.framework/) INCLUDE_DIRECTORIES("/opt/local/include/") ENDIF(USE_FTGL)