From f980c733b2d14f50089a6b00985317d0dc3b2477 Mon Sep 17 00:00:00 2001 From: Tyler Wilding Date: Tue, 20 Jun 2023 22:25:47 -0500 Subject: [PATCH] cmake: properly statically link SDL when applicable (#2762) --- .github/scripts/releases/extract_build_linux.sh | 1 - .github/scripts/releases/extract_build_windows.sh | 1 - third-party/cmake/modules/SDLOptions.cmake | 11 +++++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/scripts/releases/extract_build_linux.sh b/.github/scripts/releases/extract_build_linux.sh index 5f95e6531a..8c5a3ba99d 100755 --- a/.github/scripts/releases/extract_build_linux.sh +++ b/.github/scripts/releases/extract_build_linux.sh @@ -27,7 +27,6 @@ fi mkdir -p $DEST/data mkdir -p $DEST/data/launcher/ mkdir -p $DEST/data/decompiler/ -mkdir -p $DEST/data/assets mkdir -p $DEST/data/game mkdir -p $DEST/data/log mkdir -p $DEST/data/game/graphics/opengl_renderer/ diff --git a/.github/scripts/releases/extract_build_windows.sh b/.github/scripts/releases/extract_build_windows.sh index 8462ca352f..019f001b0c 100755 --- a/.github/scripts/releases/extract_build_windows.sh +++ b/.github/scripts/releases/extract_build_windows.sh @@ -15,7 +15,6 @@ cp $BIN_SOURCE/extractor.exe $DEST mkdir -p $DEST/data mkdir -p $DEST/data/launcher/ mkdir -p $DEST/data/decompiler/ -mkdir -p $DEST/data/assets mkdir -p $DEST/data/game mkdir -p $DEST/data/log mkdir -p $DEST/data/game/graphics/opengl_renderer/ diff --git a/third-party/cmake/modules/SDLOptions.cmake b/third-party/cmake/modules/SDLOptions.cmake index d99990e1b2..c04d412afa 100644 --- a/third-party/cmake/modules/SDLOptions.cmake +++ b/third-party/cmake/modules/SDLOptions.cmake @@ -1,5 +1,12 @@ -set(SDL_STATIC OFF CACHE BOOL "" FORCE) -set(SDL_SHARED ON CACHE BOOL "" FORCE) +if(STATICALLY_LINK) + message(STATUS "Statically Linking SDL") + set(SDL_STATIC ON CACHE BOOL "" FORCE) + set(SDL_SHARED OFF CACHE BOOL "" FORCE) +else() + message(STATUS "Dynamically Linking SDL") + set(SDL_STATIC OFF CACHE BOOL "" FORCE) + set(SDL_SHARED ON CACHE BOOL "" FORCE) +endif() # why this is disabled, i have no idea but this MUST be on for a windows+clang(llvm) shared compile to work set(SDL_LIBC ON CACHE BOOL "" FORCE)