mirror of
https://github.com/tildearrow/furnace.git
synced 2025-01-03 06:01:29 +00:00
update SDL to prepare for MinGW
This commit is contained in:
parent
630d968975
commit
137258c269
4 changed files with 20 additions and 18 deletions
4
.gitmodules
vendored
4
.gitmodules
vendored
|
@ -3,8 +3,8 @@
|
||||||
url = https://github.com/nukeykt/Nuked-OPN2
|
url = https://github.com/nukeykt/Nuked-OPN2
|
||||||
[submodule "extern/SDL"]
|
[submodule "extern/SDL"]
|
||||||
path = extern/SDL
|
path = extern/SDL
|
||||||
url = https://github.com/spurious/SDL-mirror
|
url = https://github.com/libsdl-org/SDL.git
|
||||||
branch = release-2.0.12
|
branch = main
|
||||||
[submodule "extern/Nuked-OPM"]
|
[submodule "extern/Nuked-OPM"]
|
||||||
path = extern/Nuked-OPM
|
path = extern/Nuked-OPM
|
||||||
url = https://github.com/nukeykt/Nuked-OPM
|
url = https://github.com/nukeykt/Nuked-OPM
|
||||||
|
|
2
extern/SDL
vendored
2
extern/SDL
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit 863c4bd26b51892864c6042ad2db474e11b08fed
|
Subproject commit 21d46b7e0c59b9b0385293acc90893e879363da3
|
30
extern/zlib/CMakeLists.txt
vendored
30
extern/zlib/CMakeLists.txt
vendored
|
@ -230,20 +230,20 @@ endif()
|
||||||
# Example binaries
|
# Example binaries
|
||||||
#============================================================================
|
#============================================================================
|
||||||
|
|
||||||
add_executable(example test/example.c)
|
#add_executable(example test/example.c)
|
||||||
target_link_libraries(example zlib)
|
#target_link_libraries(example zlib)
|
||||||
add_test(example example)
|
#add_test(example example)
|
||||||
|
|
||||||
add_executable(minigzip test/minigzip.c)
|
#add_executable(minigzip test/minigzip.c)
|
||||||
target_link_libraries(minigzip zlib)
|
#target_link_libraries(minigzip zlib)
|
||||||
|
|
||||||
if(HAVE_OFF64_T)
|
#if(HAVE_OFF64_T)
|
||||||
add_executable(example64 test/example.c)
|
# add_executable(example64 test/example.c)
|
||||||
target_link_libraries(example64 zlib)
|
# target_link_libraries(example64 zlib)
|
||||||
set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
|
# set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
|
||||||
add_test(example64 example64)
|
# add_test(example64 example64)
|
||||||
|
#
|
||||||
add_executable(minigzip64 test/minigzip.c)
|
# add_executable(minigzip64 test/minigzip.c)
|
||||||
target_link_libraries(minigzip64 zlib)
|
# target_link_libraries(minigzip64 zlib)
|
||||||
set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
|
# set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
|
||||||
endif()
|
#endif()
|
||||||
|
|
2
extern/zlib/MODIFIED
vendored
Normal file
2
extern/zlib/MODIFIED
vendored
Normal 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.
|
Loading…
Reference in a new issue