BlackMATov/enduro2d
1
0
Fork 0
mirror of https://github.com/enduro2d/enduro2d.git synced 2025-12-16 22:16:53 +07:00
Code Issues Packages Projects Releases Wiki Activity

first glfw window for linux

Browse Source
This commit is contained in:
Matvey Cherevko
2018-09-20 21:56:13 +07:00
parent b0c9bfce0e
commit 944f006631
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@@ -5,7 +5,9 @@ project(enduro2d)
# build mode # build mode
# #
foreach(flags CMAKE_C_FLAGS_DEBUG foreach(flags CMAKE_C_FLAGS
CMAKE_C_FLAGS_DEBUG
CMAKE_CXX_FLAGS
CMAKE_CXX_FLAGS_DEBUG) CMAKE_CXX_FLAGS_DEBUG)
set(${flags} "${${flags}} -D_DEBUG -DNRELEASE") set(${flags} "${${flags}} -D_DEBUG -DNRELEASE")
endforeach(flags) endforeach(flags)
@@ -86,15 +88,13 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
CXX_EXTENSIONS NO) CXX_EXTENSIONS NO)
# #
# 3rd party # glfw module
# #
if(WIN32 OR APPLE) set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE) set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE) set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) add_subdirectory(modules/glfw)
add_subdirectory(modules/glfw)
endif(WIN32 OR APPLE)
# #
# subdirectories # subdirectories

6
samples/CMakeLists.txt
View File

@@ -36,15 +36,11 @@ function(add_e2d_sample NAME)
PRIVATE "../headers") PRIVATE "../headers")
target_link_libraries(${SAMPLE_NAME} target_link_libraries(${SAMPLE_NAME}
glfw
enduro2d enduro2d
${OPENGL_gl_LIBRARY} ${OPENGL_gl_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}) ${CMAKE_THREAD_LIBS_INIT})
if(WIN32 OR APPLE)
target_link_libraries(${SAMPLE_NAME}
glfw)
endif(WIN32 OR APPLE)
if(APPLE) if(APPLE)
target_link_libraries(${SAMPLE_NAME} target_link_libraries(${SAMPLE_NAME}
${Cocoa} ${Cocoa}

2
sources/enduro2d/core/window_impl/window.hpp
View File

@@ -16,7 +16,7 @@
# if defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_IOS # if defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_IOS
# define E2D_WINDOW_MODE E2D_WINDOW_MODE_NONE # define E2D_WINDOW_MODE E2D_WINDOW_MODE_NONE
# elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_LINUX # 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 # elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_MACOSX
# define E2D_WINDOW_MODE E2D_WINDOW_MODE_GLFW # define E2D_WINDOW_MODE E2D_WINDOW_MODE_GLFW
# elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_WINDOWS # elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_WINDOWS