From e7dcc1a3a03968be4f97a937d2e4cc12f21672ba Mon Sep 17 00:00:00 2001 From: Sasha Szpakowski Date: Sat, 1 Jul 2023 17:33:36 -0300 Subject: [PATCH] Reapply megasource changes to SDL2's cmakelists.txt --- libs/SDL2/CMakeLists.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libs/SDL2/CMakeLists.txt b/libs/SDL2/CMakeLists.txt index d6c82c81..b1b63db2 100644 --- a/libs/SDL2/CMakeLists.txt +++ b/libs/SDL2/CMakeLists.txt @@ -347,6 +347,8 @@ if(VITA OR PSP OR PS2 OR N3DS) set(SDL_LOADSO_ENABLED_BY_DEFAULT OFF) endif() +set(BUILD_SHARED_LIBS ON) + # When defined, respect CMake's BUILD_SHARED_LIBS setting: set(SDL_STATIC_ENABLED_BY_DEFAULT ON) if (NOT DEFINED SDL_SHARED_ENABLED_BY_DEFAULT) @@ -1741,6 +1743,8 @@ elseif(WINDOWS) set(HAVE_SDL_MISC TRUE) endif() + set(SDL_LINK_DIR ${PARENT_SCOPE}) + # Check for DirectX if(SDL_DIRECTX) if(DEFINED MSVC_VERSION AND NOT ${MSVC_VERSION} LESS 1700) @@ -1781,6 +1785,8 @@ elseif(WINDOWS) set(CMAKE_REQUIRED_FLAGS ${ORIG_CMAKE_REQUIRED_FLAGS}) endif() + link_directories(${SDL_LINK_DIR}) + if(SDL_XINPUT) # xinput.h may need windows.h, but does not include it itself. check_c_source_compiles(" @@ -3436,6 +3442,13 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSDL_BUILD_MAJOR_VERSION=${SDL_MAJOR_VERSIO set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSDL_BUILD_MINOR_VERSION=${SDL_MINOR_VERSION}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSDL_BUILD_MICRO_VERSION=${SDL_MICRO_VERSION}") +if(MEGA) + if(SDL_SHARED) + install(TARGETS SDL2 RUNTIME DESTINATION . LIBRARY DESTINATION .) + endif() + return() +endif() + ##### Tests ##### if(SDL_TEST)