Archive/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-10-20 00:57:44 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

cmake: properly statically link SDL when applicable (#2762)

Browse source
This commit is contained in:
Tyler Wilding 2023-06-20 22:25:47 -05:00 committed by GitHub
parent d3e7a48639
commit f980c733b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/scripts/releases/extract_build_linux.sh vendored
View file

@ -27,7 +27,6 @@ fi
mkdir -p $DEST/data mkdir -p $DEST/data
mkdir -p $DEST/data/launcher/ mkdir -p $DEST/data/launcher/
mkdir -p $DEST/data/decompiler/ mkdir -p $DEST/data/decompiler/
mkdir -p $DEST/data/assets
mkdir -p $DEST/data/game mkdir -p $DEST/data/game
mkdir -p $DEST/data/log mkdir -p $DEST/data/log
mkdir -p $DEST/data/game/graphics/opengl_renderer/ mkdir -p $DEST/data/game/graphics/opengl_renderer/

1
.github/scripts/releases/extract_build_windows.sh vendored
View file

@ -15,7 +15,6 @@ cp $BIN_SOURCE/extractor.exe $DEST
mkdir -p $DEST/data mkdir -p $DEST/data
mkdir -p $DEST/data/launcher/ mkdir -p $DEST/data/launcher/
mkdir -p $DEST/data/decompiler/ mkdir -p $DEST/data/decompiler/
mkdir -p $DEST/data/assets
mkdir -p $DEST/data/game mkdir -p $DEST/data/game
mkdir -p $DEST/data/log mkdir -p $DEST/data/log
mkdir -p $DEST/data/game/graphics/opengl_renderer/ mkdir -p $DEST/data/game/graphics/opengl_renderer/

11
third-party/cmake/modules/SDLOptions.cmake generated vendored
View file

@ -1,5 +1,12 @@
set(SDL_STATIC OFF CACHE BOOL "" FORCE) if(STATICALLY_LINK)
set(SDL_SHARED ON CACHE BOOL "" FORCE) 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 # 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) set(SDL_LIBC ON CACHE BOOL "" FORCE)