[sfml] Update to SFML 2.6.1 64-bit on Windows

This commit is contained in:
badlogic 2024-04-03 14:27:33 +02:00
parent 08121daf5e
commit 8af890901f
2 changed files with 6 additions and 8 deletions

View File

@ -32,10 +32,10 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
)
endif()
else()
set(SFML_URL "https://www.sfml-dev.org/files/SFML-2.5.1-windows-vc14-32-bit.zip")
set(SFML_DIR ${DEPS_DIR}/SFML-2.5.1)
set(SFML_URL "https://www.sfml-dev.org/files/SFML-2.6.1-windows-vc17-64-bit.zip")
set(SFML_DIR ${DEPS_DIR}/SFML-2.6.1)
if (NOT EXISTS ${SFML_DIR})
message("Downloading SFML for Windows 32-bit")
message("Downloading SFML for Windows 64-bit")
file(DOWNLOAD "${SFML_URL}" "${DEPS_DIR}/sfml.zip")
execute_process(
COMMAND ${CMAKE_COMMAND} -E tar x ${DEPS_DIR}/sfml.zip

View File

@ -30,10 +30,10 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
)
endif()
else()
set(SFML_URL "https://www.sfml-dev.org/files/SFML-2.5.1-windows-vc14-32-bit.zip")
set(SFML_DIR ${DEPS_DIR}/SFML-2.5.1)
set(SFML_URL "https://www.sfml-dev.org/files/SFML-2.6.1-windows-vc17-64-bit.zip")
set(SFML_DIR ${DEPS_DIR}/SFML-2.6.1)
if (NOT EXISTS ${SFML_DIR})
message("Downloading SFML for Windows 32-bit")
message("Downloading SFML for Windows 64-bit")
file(DOWNLOAD "${SFML_URL}" "${DEPS_DIR}/sfml.zip")
execute_process(
COMMAND ${CMAKE_COMMAND} -E tar x ${DEPS_DIR}/sfml.zip
@ -86,7 +86,6 @@ else()
target_link_libraries(spine-sfml-cpp-example ${SFML_LIBS}/sfml-window-s-d.lib)
target_link_libraries(spine-sfml-cpp-example ${SFML_LIBS}/sfml-system-s-d.lib)
target_link_libraries(spine-sfml-cpp-example ${SFML_LIBS}/freetype.lib)
target_link_libraries(spine-sfml-cpp-example ${SFML_LIBS}/jpeg.lib)
target_link_libraries(spine-sfml-cpp-example opengl32)
target_link_libraries(spine-sfml-cpp-example gdi32)
target_link_libraries(spine-sfml-cpp-example winmm)
@ -95,7 +94,6 @@ else()
target_link_libraries(spine-sfml-cpp-testbed ${SFML_LIBS}/sfml-window-s-d.lib)
target_link_libraries(spine-sfml-cpp-testbed ${SFML_LIBS}/sfml-system-s-d.lib)
target_link_libraries(spine-sfml-cpp-testbed ${SFML_LIBS}/freetype.lib)
target_link_libraries(spine-sfml-cpp-testbed ${SFML_LIBS}/jpeg.lib)
target_link_libraries(spine-sfml-cpp-testbed opengl32)
target_link_libraries(spine-sfml-cpp-testbed gdi32)
target_link_libraries(spine-sfml-cpp-testbed winmm)