From 39ca43ca3b24dcae76e1283ec8af4a16c845e2b7 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Wed, 20 Sep 2017 00:29:45 +0100 Subject: More tests and adding spritesheet support --- yage/CMakeLists.txt | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'yage/CMakeLists.txt') diff --git a/yage/CMakeLists.txt b/yage/CMakeLists.txt index d45ffa90..1de87757 100644 --- a/yage/CMakeLists.txt +++ b/yage/CMakeLists.txt @@ -2,32 +2,31 @@ cmake_policy(SET CMP0048 NEW) project(yage VERSION 0.1.1.0 - LANGUAGES CXX - ) + LANGUAGES CXX) include(base/CMakeLists.txt) include(physics/CMakeLists.txt) include(math/CMakeLists.txt) set(YAGE_SOURCES + yage.cpp ${YAGE_BASE_SOURCES} ${YAGE_PHYSICS_SOURCES} - ${YAGE_MATH_SOURCES} - ) + ${YAGE_MATH_SOURCES}) set(${PROJECT_NAME}_DIR ${PROJECT_SOURCE_DIR}) add_library(${PROJECT_NAME} - ${YAGE_SOURCES} - ) + ${YAGE_SOURCES}) target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} - ) + ${OPENGL_INCLUDE_DIR} + ${GLEW_INCLUDE_DIR} + ${SDL2_INCLUDE_DIR}) target_link_libraries(${PROJECT_NAME} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} - ${SDL2_LIBRARIES} - ) + ${SDL2_LIBRARIES}) -- cgit From 977b8f16d7ef43101b6ef588f9610f34285fa7e6 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Wed, 20 Sep 2017 23:01:12 +0100 Subject: Replacing SDL by glfw --- yage/CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'yage/CMakeLists.txt') diff --git a/yage/CMakeLists.txt b/yage/CMakeLists.txt index 1de87757..e274fca5 100644 --- a/yage/CMakeLists.txt +++ b/yage/CMakeLists.txt @@ -23,10 +23,9 @@ add_library(${PROJECT_NAME} target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${OPENGL_INCLUDE_DIR} - ${GLEW_INCLUDE_DIR} - ${SDL2_INCLUDE_DIR}) + ${GLEW_INCLUDE_DIR}) target_link_libraries(${PROJECT_NAME} - ${OPENGL_LIBRARIES} + ${OPENGL_gl_LIBRARY} ${GLEW_LIBRARIES} - ${SDL2_LIBRARIES}) + glfw) -- cgit From 8a78e678b7df0bf8221280f0058e2db0381b3ffa Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Thu, 21 Sep 2017 23:42:30 +0100 Subject: #11: Building, #10: Added GLFW --- yage/CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'yage/CMakeLists.txt') diff --git a/yage/CMakeLists.txt b/yage/CMakeLists.txt index e274fca5..e9d4071b 100644 --- a/yage/CMakeLists.txt +++ b/yage/CMakeLists.txt @@ -22,10 +22,9 @@ add_library(${PROJECT_NAME} target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} - ${OPENGL_INCLUDE_DIR} - ${GLEW_INCLUDE_DIR}) + ${OPENGL_INCLUDE_DIR}) target_link_libraries(${PROJECT_NAME} ${OPENGL_gl_LIBRARY} - ${GLEW_LIBRARIES} - glfw) + glfw + glad) -- cgit