From 8ae804ff9a677c068486303510d1ebc4e8cd3a14 Mon Sep 17 00:00:00 2001 From: Peter0x44 Date: Sun, 3 Dec 2023 18:53:11 +0000 Subject: [PATCH] Fix cmake-built libraylib.a to properly include GLFW's object files (#3598) I broke this in PR #3573 by accidentally removing too much The examples still compiled fine so I didn't notice - my guess is that cmake was still adding a separate link to glfw manually. --- cmake/GlfwImport.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/GlfwImport.cmake b/cmake/GlfwImport.cmake index bd7d5681..77c88e6c 100644 --- a/cmake/GlfwImport.cmake +++ b/cmake/GlfwImport.cmake @@ -17,7 +17,7 @@ if(NOT glfw3_FOUND AND NOT USE_EXTERNAL_GLFW STREQUAL "ON" AND "${PLATFORM}" MAT set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) set(GLFW_INSTALL OFF CACHE BOOL "" FORCE) set(GLFW_USE_WAYLAND ${USE_WAYLAND} CACHE BOOL "" FORCE) - set(GLFW_LIBRARY_TYPE "STATIC" CACHE STRING "" FORCE) + set(GLFW_LIBRARY_TYPE "OBJECT" CACHE STRING "" FORCE) add_subdirectory(external/glfw) @@ -27,6 +27,7 @@ if(NOT glfw3_FOUND AND NOT USE_EXTERNAL_GLFW STREQUAL "ON" AND "${PLATFORM}" MAT set_property(TARGET glfw PROPERTY C_VISIBILITY_PRESET hidden) endif() + list(APPEND raylib_sources $) include_directories(BEFORE SYSTEM external/glfw/include) elseif("${PLATFORM}" STREQUAL "DRM") MESSAGE(STATUS "No GLFW required on PLATFORM_DRM")