Commit c9349fe8 authored by Daniel Burke's avatar Daniel Burke

Removed GLEW as APPLE build requirement

parent f4883105
......@@ -69,11 +69,15 @@ ELSE( WIN32 OR WIN64 )
IF ( freetype-gl_LIBS_SUPPLIED )
FIND_PACKAGE( GLUT )
FIND_PACKAGE( Freetype )
FIND_PACKAGE( GLEW )
IF ( NOT APPLE )
FIND_PACKAGE( GLEW )
ENDIF()
ELSE ( freetype-gl_LIBS_SUPPLIED )
FIND_PACKAGE( GLUT REQUIRED )
FIND_PACKAGE( Freetype REQUIRED )
FIND_PACKAGE( GLEW REQUIRED )
IF ( NOT APPLE )
FIND_PACKAGE( GLEW )
ENDIF()
ENDIF ( freetype-gl_LIBS_SUPPLIED )
FIND_PACKAGE( FontConfig )
......@@ -86,7 +90,6 @@ ENDIF( WIN32 OR WIN64 )
INCLUDE_DIRECTORIES( ${GLUT_INCLUDE_DIR}
${OPENGL_INCLUDE_DIRS}
${FREETYPE_INCLUDE_DIRS}
${GLEW_INCLUDE_PATHS}
${CMAKE_CURRENT_SOURCE_DIR}
${VS789FIX_INCLUDE_DIR}
${GLEW_INCLUDE_PATH})
......@@ -117,11 +120,12 @@ LINK_DIRECTORIES(${PROJECT_SOURCE_DIR})
MACRO( DEMO _target _sources)
add_executable(${_target} ${_sources})
include_directories(${WINDOWS_DIR} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_PATH} ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2} ${ANT_TWEAK_BAR_INCLUDE_PATH})
if(NOT APPLE)
target_link_libraries(${_target} ${GLEW_LIBRARY})
endif()
target_link_libraries(${_target} freetype-gl)
target_link_libraries(${_target} ${OPENGL_LIBRARY})
target_link_libraries(${_target} ${GLUT_LIBRARY})
target_link_libraries(${_target} ${GLEW_LIBRARY})
target_link_libraries(${_target} ${FREETYPE_LIBRARY})
IF( MATH_LIBRARY )
target_link_libraries(${_target} ${MATH_LIBRARY})
......
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