update SDL to prepare for MinGW

This commit is contained in:
tildearrow 2021-12-07 13:31:02 -05:00
parent 630d968975
commit 137258c269
4 changed files with 20 additions and 18 deletions

4
.gitmodules vendored
View File

@ -3,8 +3,8 @@
url = https://github.com/nukeykt/Nuked-OPN2
[submodule "extern/SDL"]
path = extern/SDL
url = https://github.com/spurious/SDL-mirror
branch = release-2.0.12
url = https://github.com/libsdl-org/SDL.git
branch = main
[submodule "extern/Nuked-OPM"]
path = extern/Nuked-OPM
url = https://github.com/nukeykt/Nuked-OPM

2
extern/SDL vendored

@ -1 +1 @@
Subproject commit 863c4bd26b51892864c6042ad2db474e11b08fed
Subproject commit 21d46b7e0c59b9b0385293acc90893e879363da3

View File

@ -230,20 +230,20 @@ endif()
# Example binaries
#============================================================================
add_executable(example test/example.c)
target_link_libraries(example zlib)
add_test(example example)
#add_executable(example test/example.c)
#target_link_libraries(example zlib)
#add_test(example example)
add_executable(minigzip test/minigzip.c)
target_link_libraries(minigzip zlib)
#add_executable(minigzip test/minigzip.c)
#target_link_libraries(minigzip zlib)
if(HAVE_OFF64_T)
add_executable(example64 test/example.c)
target_link_libraries(example64 zlib)
set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
add_test(example64 example64)
add_executable(minigzip64 test/minigzip.c)
target_link_libraries(minigzip64 zlib)
set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
endif()
#if(HAVE_OFF64_T)
# add_executable(example64 test/example.c)
# target_link_libraries(example64 zlib)
# set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
# add_test(example64 example64)
#
# add_executable(minigzip64 test/minigzip.c)
# target_link_libraries(minigzip64 zlib)
# set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
#endif()

2
extern/zlib/MODIFIED vendored Normal file
View File

@ -0,0 +1,2 @@
THIS IS A MODIFIED VERSION OF THE ORIGINAL ZLIB LIBRARY.
IT DISABLES BUILDING EXAMPLE APPLICATIONS AS IT TRIGGERS AN ERROR WHEN BUILDING USING MINGW.