summaryrefslogtreecommitdiffstats
path: root/cmake/scripts/windowsstore
diff options
context:
space:
mode:
authormanuel <manuel@mausz.at>2019-04-29 12:22:05 +0200
committermanuel <manuel@mausz.at>2019-04-29 12:22:05 +0200
commite317daf081a1048904fdf0b548946fa3ba6593a7 (patch)
tree285a58fe8c6b4a95c9a6020afbe7bcc9cb913ea7 /cmake/scripts/windowsstore
parent483c0b88bfc1b798396c31a4dd2f5239399ce59e (diff)
downloadkodi-pvr-build-e317daf081a1048904fdf0b548946fa3ba6593a7.tar.gz
kodi-pvr-build-e317daf081a1048904fdf0b548946fa3ba6593a7.tar.bz2
kodi-pvr-build-e317daf081a1048904fdf0b548946fa3ba6593a7.zip
sync with upstream
Diffstat (limited to 'cmake/scripts/windowsstore')
-rw-r--r--cmake/scripts/windowsstore/ArchSetup.cmake10
1 files changed, 5 insertions, 5 deletions
diff --git a/cmake/scripts/windowsstore/ArchSetup.cmake b/cmake/scripts/windowsstore/ArchSetup.cmake
index e3e46e7..2e6d7cb 100644
--- a/cmake/scripts/windowsstore/ArchSetup.cmake
+++ b/cmake/scripts/windowsstore/ArchSetup.cmake
@@ -1,5 +1,5 @@
1# Minimum SDK version we support 1# Minimum SDK version we support
2set(VS_MINIMUM_SDK_VERSION 10.0.16299.0) 2set(VS_MINIMUM_SDK_VERSION 10.0.17763.0)
3 3
4if(CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION VERSION_LESS VS_MINIMUM_SDK_VERSION) 4if(CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION VERSION_LESS VS_MINIMUM_SDK_VERSION)
5 message(FATAL_ERROR "Detected Windows SDK version is ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}.\n" 5 message(FATAL_ERROR "Detected Windows SDK version is ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}.\n"
@@ -49,10 +49,10 @@ set(DEPENDENCIES_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/win10-${ARCH})
49set(MINGW_LIBS_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/mingwlibs/win10-${ARCH}) 49set(MINGW_LIBS_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/mingwlibs/win10-${ARCH})
50 50
51# mingw libs 51# mingw libs
52list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${MINGW_LIBS_DIR}) 52list(APPEND CMAKE_PREFIX_PATH ${MINGW_LIBS_DIR})
53list(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${MINGW_LIBS_DIR}/bin) 53list(APPEND CMAKE_LIBRARY_PATH ${MINGW_LIBS_DIR}/bin)
54# dependencies 54# dependencies
55list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${DEPENDENCIES_DIR}) 55list(APPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR})
56# for python 56# for python
57set(PYTHON_INCLUDE_DIR ${DEPENDENCIES_DIR}/include/python) 57set(PYTHON_INCLUDE_DIR ${DEPENDENCIES_DIR}/include/python)
58 58
@@ -91,7 +91,7 @@ set(gtest_force_shared_crt ON CACHE STRING "" FORCE)
91link_directories(${MINGW_LIBS_DIR}/lib 91link_directories(${MINGW_LIBS_DIR}/lib
92 ${DEPENDENCIES_DIR}/lib) 92 ${DEPENDENCIES_DIR}/lib)
93 93
94list(APPEND DEPLIBS d3d11.lib WS2_32.lib dxguid.lib dloadhelper.lib WindowsApp.lib) 94list(APPEND DEPLIBS bcrypt.lib d3d11.lib WS2_32.lib dxguid.lib dloadhelper.lib WindowsApp.lib)
95 95
96set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /WINMD:NO") 96set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /WINMD:NO")
97set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt /DEBUG:FASTLINK /OPT:NOREF /OPT:NOICF") 97set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt /DEBUG:FASTLINK /OPT:NOREF /OPT:NOICF")