From 944f006631e6fd18cb7985d3f46347248c5a04d0 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Thu, 20 Sep 2018 21:56:13 +0700 Subject: [PATCH] first glfw window for linux --- CMakeLists.txt | 16 ++++++++-------- samples/CMakeLists.txt | 6 +----- sources/enduro2d/core/window_impl/window.hpp | 2 +- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index acd3c1f4..b409820a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,9 @@ project(enduro2d) # build mode # -foreach(flags CMAKE_C_FLAGS_DEBUG +foreach(flags CMAKE_C_FLAGS + CMAKE_C_FLAGS_DEBUG + CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG) set(${flags} "${${flags}} -D_DEBUG -DNRELEASE") endforeach(flags) @@ -86,15 +88,13 @@ set_target_properties(${PROJECT_NAME} PROPERTIES CXX_EXTENSIONS NO) # -# 3rd party +# glfw module # -if(WIN32 OR APPLE) - set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE) - set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE) - set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) - add_subdirectory(modules/glfw) -endif(WIN32 OR APPLE) +set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE) +set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE) +set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) +add_subdirectory(modules/glfw) # # subdirectories diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index c68bacd2..5b00debc 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -36,15 +36,11 @@ function(add_e2d_sample NAME) PRIVATE "../headers") target_link_libraries(${SAMPLE_NAME} + glfw enduro2d ${OPENGL_gl_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}) - if(WIN32 OR APPLE) - target_link_libraries(${SAMPLE_NAME} - glfw) - endif(WIN32 OR APPLE) - if(APPLE) target_link_libraries(${SAMPLE_NAME} ${Cocoa} diff --git a/sources/enduro2d/core/window_impl/window.hpp b/sources/enduro2d/core/window_impl/window.hpp index 77ea4892..fbf71679 100644 --- a/sources/enduro2d/core/window_impl/window.hpp +++ b/sources/enduro2d/core/window_impl/window.hpp @@ -16,7 +16,7 @@ # if defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_IOS # define E2D_WINDOW_MODE E2D_WINDOW_MODE_NONE # elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_LINUX -# define E2D_WINDOW_MODE E2D_WINDOW_MODE_NONE +# define E2D_WINDOW_MODE E2D_WINDOW_MODE_GLFW # elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_MACOSX # define E2D_WINDOW_MODE E2D_WINDOW_MODE_GLFW # elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_WINDOWS