From 26f39e41a931cfb9fa917636454a5bf6caae6cfc Mon Sep 17 00:00:00 2001 From: raysan5 Date: Mon, 13 Apr 2020 15:10:42 +0200 Subject: [PATCH] Remove games from building --- .travis.yml | 2 +- CMakeLists.txt | 5 ----- appveyor.yml | 2 +- projects/CMake/CMakeLists.txt | 3 +-- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index ea319702e..d24a3dc2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -134,7 +134,7 @@ script: - $RUNNER cmake $CMAKE_ARCH_ARGS -DMACOS_FATLIB=ON -DSTATIC=$STATIC -DSHARED=$SHARED - -DBUILD_EXAMPLES=ON -DBUILD_GAMES=ON + -DBUILD_EXAMPLES=ON -DUSE_EXTERNAL_GLFW=$USE_EXTERNAL_GLFW -DUSE_WAYLAND=$WAYLAND -DINCLUDE_EVERYTHING=ON diff --git a/CMakeLists.txt b/CMakeLists.txt index bbac563ca..c5f2fbd04 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) # Config options option(BUILD_EXAMPLES "Build the examples." ON) -option(BUILD_GAMES "Build the example games." ON) option(ENABLE_ASAN "Enable AddressSanitizer (ASAN) for debugging (degrades performance)" OFF) option(ENABLE_UBSAN "Enable UndefinedBehaviorSanitizer (UBSan) for debugging" OFF) option(ENABLE_MSAN "Enable MemorySanitizer (MSan) for debugging (not recommended to run with ASAN)" OFF) @@ -45,8 +44,4 @@ if (${BUILD_EXAMPLES}) add_subdirectory(examples) endif() -if (${BUILD_GAMES}) - add_subdirectory(games) -endif() - enable_testing() diff --git a/appveyor.yml b/appveyor.yml index 68a158c70..f1d8fc257 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -39,7 +39,7 @@ before_build: - cd build build_script: - - cmake -G %GENERATOR% -DCMAKE_BUILD_TYPE=Release -DSTATIC=ON -DSHARED=ON -DBUILD_EXAMPLES=%examples% -DBUILD_GAMES=%examples% -DINCLUDE_EVERYTHING=ON .. + - cmake -G %GENERATOR% -DCMAKE_BUILD_TYPE=Release -DSTATIC=ON -DSHARED=ON -DBUILD_EXAMPLES=%examples% -DINCLUDE_EVERYTHING=ON .. - cmake --build . --target install after_build: diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt index ef0d3c1b1..496577e92 100644 --- a/projects/CMake/CMakeLists.txt +++ b/projects/CMake/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.11) # FetchContent is available in 3.11+ project(example) # Set this to the minimal version you want to support -find_package(raylib 2.5 QUIET) # Let CMake search for a raylib-config.cmake +find_package(raylib 3.0 QUIET) # Let CMake search for a raylib-config.cmake # You could change the QUIET above to REQUIRED and remove this if() clause # This part downloads raylib and builds it if it's not installed on your system @@ -20,7 +20,6 @@ if (NOT raylib_FOUND) # If there's none, fetch and build raylib FetchContent_Populate(raylib) set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) # don't build the supplied examples - set(BUILD_GAMES OFF CACHE BOOL "" FORCE) # or games # build raylib add_subdirectory(${raylib_SOURCE_DIR} ${raylib_BINARY_DIR})