From 2c99bc9593c4938d1f03ae949aea478c4331ad6f Mon Sep 17 00:00:00 2001 From: tildearrow Date: Sat, 26 Aug 2023 12:45:06 -0500 Subject: [PATCH] Revert "oh no there's a problem" This reverts commit 29651aabfd0a791e73cd39ad4053b4831d81473e. --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index fb157e871..7e5d3afe6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -284,6 +284,12 @@ if (USE_SDL2) # This should probably go in a FAQ. set(SDL_LIBC ON CACHE BOOL "Tell SDL that we want it to use our C runtime (required for proper static linking)" FORCE) + # https://github.com/tildearrow/furnace/issues/1237 + # enabling this will result in SDL finding the Direct3D headers, forcing _WIN32_WINNT to an undesirable value (which makes the Wine headers define GetTickCount64) + if (SUPPORT_XP) + set(SDL_RENDER_D3D OFF CACHE BOOL "Enable the Direct3D render driver" FORCE) + endif() + add_subdirectory(extern/SDL EXCLUDE_FROM_ALL) list(APPEND DEPENDENCIES_DEFINES HAVE_SDL2) list(APPEND DEPENDENCIES_INCLUDE_DIRS extern/SDL/include)