Skip to content

Commit

Permalink
libs: revert to SDL 2.0.14 on windows
Browse files Browse the repository at this point in the history
  • Loading branch information
rmarquis committed Oct 10, 2021
1 parent b9b6218 commit ce9ea73
Showing 1 changed file with 27 additions and 11 deletions.
38 changes: 27 additions & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -689,17 +689,33 @@ if(BUNDLED_SDL AND BUILD_CLIENT)
set(SDL_CMAKE_ARGS ${SDL_CMAKE_ARGS} -DVIDEO_OPENGLES=${FEATURE_RENDERER_GLES} -DFORCE_STATIC_VCRT=ON)
endif()

ExternalProject_Add(bundled_sdl
# SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/sdl2
DOWNLOAD_DIR ${LIBS_DOWNLOAD_DIR}
SOURCE_DIR "${LIBS_DOWNLOAD_SRC_DIR}/sdl2"
URL https://github.com/libsdl-org/SDL/archive/release-2.0.16.tar.gz
URL_HASH MD5=b52877e5e92d80a20a4be4c868aa1f18
BINARY_DIR ${LIBS_BINARY_DIR}/sdl2
BUILD_BYPRODUCTS ${SDL32_BUNDLED_LIBRARIES}
CMAKE_ARGS ${SDL_CMAKE_ARGS}
PREFIX ${LIBS_BINARY_DIR}/sdl2
)
# ship old version on windows due to focus bug
# see https://github.com/etlegacy/etlegacy/issues/1762
if(WIN32)
ExternalProject_Add(bundled_sdl
# SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/sdl2
DOWNLOAD_DIR ${LIBS_DOWNLOAD_DIR}
SOURCE_DIR "${LIBS_DOWNLOAD_SRC_DIR}/sdl2"
URL https://github.com/libsdl-org/SDL/archive/release-2.0.14.tar.gz
URL_HASH MD5=147b87f087cd8aa1c8a1b473280c40b7
BINARY_DIR ${LIBS_BINARY_DIR}/sdl2
BUILD_BYPRODUCTS ${SDL32_BUNDLED_LIBRARIES}
CMAKE_ARGS ${SDL_CMAKE_ARGS}
PREFIX ${LIBS_BINARY_DIR}/sdl2
)
else()
ExternalProject_Add(bundled_sdl
# SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/sdl2
DOWNLOAD_DIR ${LIBS_DOWNLOAD_DIR}
SOURCE_DIR "${LIBS_DOWNLOAD_SRC_DIR}/sdl2"
URL https://github.com/libsdl-org/SDL/archive/release-2.0.16.tar.gz
URL_HASH MD5=b52877e5e92d80a20a4be4c868aa1f18
BINARY_DIR ${LIBS_BINARY_DIR}/sdl2
BUILD_BYPRODUCTS ${SDL32_BUNDLED_LIBRARIES}
CMAKE_ARGS ${SDL_CMAKE_ARGS}
PREFIX ${LIBS_BINARY_DIR}/sdl2
)
endif()

#ExternalProject_Get_Property(bundled_sdl binary_dir)

Expand Down

0 comments on commit ce9ea73

Please sign in to comment.