Commit c1b66a37 authored by Nicolas P. Rougier's avatar Nicolas P. Rougier

Merge pull request #12 from jhasse/patch-makefont

Link OpenGL after freetype-gl. Fixes #2
parents 873c0772 5cb9fb08
......@@ -71,6 +71,7 @@ ELSE( WIN32 OR WIN64 )
FIND_PACKAGE( FontConfig )
FIND_LIBRARY( MATH_LIBRARY m )
#FIND_LIBRARY( STDC_LIBRARY stdc++) #Buggy Cmake can't find libstdc++
SET( ANT_TWEAK_BAR_INCLUDE_PATH "")
FIND_PACKAGE( AntTweakBar )
ENDIF( WIN32 OR WIN64 )
......@@ -108,9 +109,9 @@ LINK_DIRECTORIES(${PROJECT_SOURCE_DIR})
MACRO( DEMO _target _sources)
add_executable(${_target} ${_sources})
include_directories(${WINDOWS_DIR} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2} ${ANT_TWEAK_BAR_INCLUDE_PATH})
target_link_libraries(${_target} ${OPENGL_LIBRARY})
target_link_libraries(${_target} ${GLEW_LIBRARY})
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})
......
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