mirror of https://github.com/libsdl-org/SDL
Fixed bug 5287 - Support building for UWP with CMake
Jan Niklas Hasse Actually the SDL2-static target works, if I set SDL_SENSOR to OFF. Awesome! See this patch: https://github.com/microsoft/vcpkg/blob/master/ports/sdl2/0003-sdl2-fix-uwp-build.patch
This commit is contained in:
parent
351abc585b
commit
d54b125a86
|
@ -1400,8 +1400,13 @@ elseif(WINDOWS)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(WINDOWS_STORE)
|
||||||
|
file(GLOB WINRT_MISC_SOURCES ${SDL2_SOURCE_DIR}/src/misc/winrt/*.cpp)
|
||||||
|
set(SOURCE_FILES ${SOURCE_FILES} ${WINRT_MISC_SOURCES})
|
||||||
|
else()
|
||||||
file(GLOB MISC_SOURCES ${SDL2_SOURCE_DIR}/src/misc/windows/*.c)
|
file(GLOB MISC_SOURCES ${SDL2_SOURCE_DIR}/src/misc/windows/*.c)
|
||||||
set(SOURCE_FILES ${SOURCE_FILES} ${MISC_SOURCES})
|
set(SOURCE_FILES ${SOURCE_FILES} ${MISC_SOURCES})
|
||||||
|
endif()
|
||||||
set(HAVE_SDL_MISC TRUE)
|
set(HAVE_SDL_MISC TRUE)
|
||||||
|
|
||||||
# Check for DirectX
|
# Check for DirectX
|
||||||
|
@ -1524,7 +1529,7 @@ elseif(WINDOWS)
|
||||||
set(HAVE_SDL_THREADS TRUE)
|
set(HAVE_SDL_THREADS TRUE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(SDL_SENSOR AND HAVE_SENSORSAPI_H)
|
if(SDL_SENSOR AND HAVE_SENSORSAPI_H AND NOT WINDOWS_STORE)
|
||||||
set(SDL_SENSOR_WINDOWS 1)
|
set(SDL_SENSOR_WINDOWS 1)
|
||||||
set(HAVE_SDL_SENSORS TRUE)
|
set(HAVE_SDL_SENSORS TRUE)
|
||||||
file(GLOB WINDOWS_SENSOR_SOURCES ${SDL2_SOURCE_DIR}/src/sensor/windows/*.c)
|
file(GLOB WINDOWS_SENSOR_SOURCES ${SDL2_SOURCE_DIR}/src/sensor/windows/*.c)
|
||||||
|
|
Loading…
Reference in New Issue