diff options
| author | Oskari Timperi <oskari.timperi@iki.fi> | 2016-09-26 20:45:06 +0300 |
|---|---|---|
| committer | Oskari Timperi <oskari.timperi@iki.fi> | 2016-09-26 20:45:06 +0300 |
| commit | 775294a6527a8273b372ede43d94ed0084f2be73 (patch) | |
| tree | a2e43f2e1175042b9c1bfc2a46e0fbc0b3ceb995 | |
| parent | 764822eb2bb6189d3474e4ed3ad3ef1a7cdd2d3b (diff) | |
| download | rayskeleton-775294a6527a8273b372ede43d94ed0084f2be73.tar.gz rayskeleton-775294a6527a8273b372ede43d94ed0084f2be73.zip | |
Changes to build system
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | deps/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | src/main.c | 2 |
4 files changed, 15 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5426f67..18e0f70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.0) PROJECT(rayskeleton C) -ADD_SUBDIRECTORY(deps) -ADD_SUBDIRECTORY(src) +IF(BOOTSTRAP) + ADD_SUBDIRECTORY(deps) +ELSE() + ADD_SUBDIRECTORY(src) +ENDIF() diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index cd6aa62..188bf8c 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -1,13 +1,14 @@ INCLUDE(ExternalProject) -SET(INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/dist) -SET(DEPS_INSTALL_DIR ${INSTALL_DIR} PARENT_SCOPE) - ExternalProject_Add(raylib GIT_REPOSITORY https://github.com/oswjk/raylib.git GIT_TAG cmake EXCLUDE_FROM_ALL 1 CMAKE_ARGS -DPLATFORM_TO_USE=PLATFORM_DESKTOP - -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} + -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} + -DBOOTSTRAP:BOOLEAN=TRUE + BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> + COMMAND ${CMAKE_COMMAND} -UBOOTSTRAP <BINARY_DIR> + COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1f68a3f..0b14a50 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,24 +1,13 @@ +FIND_PACKAGE(glfw3 REQUIRED) +FIND_PACKAGE(raylib REQUIRED) + SET(SOURCES main.c ) ADD_EXECUTABLE(${CMAKE_PROJECT_NAME} ${SOURCES}) -TARGET_INCLUDE_DIRECTORIES(${CMAKE_PROJECT_NAME} PUBLIC - ${DEPS_INSTALL_DIR}/include -) - -TARGET_LINK_LIBRARIES(${CMAKE_PROJECT_NAME} - ${DEPS_INSTALL_DIR}/lib/libraylib.a - ${DEPS_INSTALL_DIR}/lib/libglfw3.a -) - -IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") - TARGET_LINK_LIBRARIES(${CMAKE_PROJECT_NAME} -lm -ldl -lpthread -lX11 -lXrandr - -lXinerama -lXi -lXxf86vm -lXcursor) -ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Windows") - TARGET_LINK_LIBRARIES(${CMAKE_PROJECT_NAME} gdi32) -ENDIF() +TARGET_LINK_LIBRARIES(${CMAKE_PROJECT_NAME} PRIVATE raylib) IF(CMAKE_COMPILER_IS_GNUCC) TARGET_COMPILE_OPTIONS(${CMAKE_PROJECT_NAME} PRIVATE -Wall -std=c99) @@ -1,4 +1,4 @@ -#include "raylib.h" +#include <raylib/raylib.h> #define SCREEN_WIDTH 800 #define SCREEN_HEIGHT 600 |