gmueller
/
gremlin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed OpenGL

This commit is contained in:
Gero Müller 2011-01-14 22:02:36 +01:00
parent cd3c163d2a
commit 14e4f4f54c
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -1,12 +1,11 @@
cmake_minimum_required (VERSION 2.6) cmake_minimum_required (VERSION 2.6)
project (GREMLIN C CXX) project (GREMLIN C CXX)
INCLUDE (CheckIncludeFiles) find_package(OpenGL)
CHECK_INCLUDE_FILES ("GL/gl.h" ENABLE_VIDEO)
if (ENABLE_VIDEO) if (OPENGL_FOUND)
add_subdirectory (libs/glfw) add_subdirectory (libs/glfw)
add_subdirectory (libs/spark) add_subdirectory (libs/spark)
endif(ENABLE_VIDEO) endif(OPENGL_FOUND)
add_subdirectory (libs/enet) add_subdirectory (libs/enet)
add_subdirectory (src) add_subdirectory (src)

10
src/CMakeLists.txt
View File

@ -1,13 +1,13 @@
if (ENABLE_VIDEO) if (OPENGL_FOUND)
# find external software # find external software
find_package(OpenGL)
# set includes # set includes
include_directories (${GREMLIN_SOURCE_DIR}/libs/glfw/include) include_directories (${GREMLIN_SOURCE_DIR}/libs/glfw/include)
include_directories (${GREMLIN_SOURCE_DIR}/libs/spark/include) include_directories (${GREMLIN_SOURCE_DIR}/libs/spark/include)
SET(VIDEO_SOURCES Explosion oglfont Client) SET(VIDEO_SOURCES Explosion oglfont Client)
endif(ENABLE_VIDEO) endif(OPENGL_FOUND)
include_directories (${GREMLIN_SOURCE_DIR}/libs/enet/include) include_directories (${GREMLIN_SOURCE_DIR}/libs/enet/include)
include_directories (${GREMLIN_SOURCE_DIR}/src) include_directories (${GREMLIN_SOURCE_DIR}/src)
@ -55,7 +55,7 @@ target_link_libraries(gremlin_dedicated
enet ${PLATFORM_LIBRARIES} enet ${PLATFORM_LIBRARIES}
) )
if (ENABLE_VIDEO) if (OPENGL_FOUND)
# set dependencies # set dependencies
add_dependencies( gremlin add_dependencies( gremlin
glfw spark glfw spark
@ -72,4 +72,4 @@ if (ENABLE_VIDEO)
target_link_libraries(gremlin target_link_libraries(gremlin
glfw spark glfw spark
) )
endif(ENABLE_VIDEO) endif(OPENGL_FOUND)