From 8b3045e255d91b94eb62fa9282e27b891e3be1bb Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 27 Apr 2015 09:51:39 +0200 Subject: [PATCH] - seems some OpenGL related stuff got lost during merge. Reinstated checks for OpenGL itself but since GLU is no longer needed it was removed for good from the project files. --- src/CMakeLists.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5feab8402..50862bbe6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -213,6 +213,18 @@ else( WIN32 ) endif( FPU_CONTROL_DIR ) endif( WIN32 ) +if( X64 ) + set( NO_ASM ON ) +endif( X64 ) + +# Check if we have OpenGL + +if( NOT OPENGL_FOUND ) + message( FATAL_ERROR "OpenGL is required for building." ) +endif( NOT OPENGL_FOUND ) + +set( ZDOOM_LIBS ${ZDOOM_LIBS} ${OPENGL_LIBRARIES} ) +include_directories( ${OPENGL_INCLUDE_DIR} ) if( NOT NO_OPENAL ) find_package( OpenAL )