BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CMAKE Conditional compilation against DirectX and OpenGL targets

Browse Source 
...just don't enable both, okay?
This commit is contained in:
sippeangelo
2015-10-20 14:51:40 +02:00
parent 80f34b27b9
commit a4b9521c34
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+9 -3
View File
@@ -4,7 +4,6 @@ project(daydream)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${PROJECT_SOURCE_DIR}/deps/include") set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${PROJECT_SOURCE_DIR}/deps/include")
if(MINGW) if(MINGW)
set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/deps/lib/mingw/x64") set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/deps/lib/mingw/x64")
elseif(MSVC) elseif(MSVC)
@@ -23,10 +22,17 @@ endif()
set(BUILD_SHARED_LIBS FALSE) set(BUILD_SHARED_LIBS FALSE)
include_directories(${PROJECT_SOURCE_DIR}/include) include_directories(${PROJECT_SOURCE_DIR}/include)
option(BUILD_RENDERER_OPENGL "Build with OpenGL 4.4 renderer" ON)
option(BUILD_RENDERER_DIRECTX "Build with DirectX 11 renderer" OFF)
# Compiling for OpenGL target # Compiling for OpenGL target
include_directories(${PROJECT_SOURCE_DIR}/include/Rendering/OpenGL) if(BUILD_RENDERER_OPENGL)
include_directories(${PROJECT_SOURCE_DIR}/include/Rendering/OpenGL)
endif()
# Compiling for DirectX target # Compiling for DirectX target
#include_directories(${PROJECT_SOURCE_DIR}/include/Rendering/DirectX) if(BUILD_RENDERER_DIRECTX)
include_directories(${PROJECT_SOURCE_DIR}/include/Rendering/DirectX)
endif()
#set(GLEW_INCLUDE_DIR ${daydream_SOURCE_DIR}/libs/glew-1.11.0/include) #set(GLEW_INCLUDE_DIR ${daydream_SOURCE_DIR}/libs/glew-1.11.0/include)
#set(GLEW_LIBRARY ${daydream_SOURCE_DIR}/libs/glew-1.11.0/lib/Release/glew32.lib) #set(GLEW_LIBRARY ${daydream_SOURCE_DIR}/libs/glew-1.11.0/lib/Release/glew32.lib)
src/game/CMakeLists.txt
+13 -2
View File
@@ -104,8 +104,6 @@ set(SOURCE_FILES
${SOURCE_FILES_Core_Util} ${SOURCE_FILES_Core_Util}
${SOURCE_FILES_Input} ${SOURCE_FILES_Input}
${SOURCE_FILES_Rendering} ${SOURCE_FILES_Rendering}
${SOURCE_FILES_Rendering_OpenGL}
#${SOURCE_FILES_Rendering_DirectX}
${SOURCE_FILES_Transform} ${SOURCE_FILES_Transform}
${SOURCE_FILES_Physics} ${SOURCE_FILES_Physics}
${SOURCE_FILES_Game} ${SOURCE_FILES_Game}
@@ -114,6 +112,19 @@ set(SOURCE_FILES
${SOURCE_FILES_GUI} ${SOURCE_FILES_GUI}
) )
if(BUILD_RENDERER_OPENGL)
set(SOURCE_FILES ${SOURCE_FILES}
${SOURCE_FILES_Rendering_OpenGL}
)
endif()
# Compiling for DirectX target
if(BUILD_RENDERER_DIRECTX)
set(SOURCE_FILES ${SOURCE_FILES}
${SOURCE_FILES_Rendering_DirectX}
)
endif()
if(CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
src/game/Rendering/OpenGL/Renderer.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ void dd::Renderer::Initialize()
glGetIntegerv(GL_MINOR_VERSION, &m_GLVersion[1]); glGetIntegerv(GL_MINOR_VERSION, &m_GLVersion[1]);
m_GLVendor = (GLchar*)glGetString(GL_VENDOR); m_GLVendor = (GLchar*)glGetString(GL_VENDOR);
std::stringstream ss; std::stringstream ss;
ss << m_GLVendor << " OpenGL " << m_GLVersion[0] << "." << m_GLVersion[1]; ss << "Squidout! (" << m_GLVendor << " OpenGL " << m_GLVersion[0] << "." << m_GLVersion[1] << ")";
#ifdef DEBUG #ifdef DEBUG
ss << " DEBUG"; ss << " DEBUG";
#endif #endif