diff options
| author | Jim Carroll <jim@dontcallme.com> | 2019-10-13 05:16:44 -0400 |
|---|---|---|
| committer | Jim Carroll <jim@dontcallme.com> | 2019-10-13 05:16:44 -0400 |
| commit | 1eb552a924fda4d901d20cde6b0e754c87b38f50 (patch) | |
| tree | dffa8561a6474011217aaf6b8477d4752d3f2c32 | |
| parent | d8343aacf84026d0a1602d584e59ad09ff71add3 (diff) | |
Fix build on various windows by including the correct openssl and Windows UWP by adding -DMS_STORE
4 files changed, 4 insertions, 4 deletions
diff --git a/cmake/scripts/windowsstore/ArchSetup.cmake b/cmake/scripts/windowsstore/ArchSetup.cmake index e92e36dd53..987f9c2f2e 100644 --- a/cmake/scripts/windowsstore/ArchSetup.cmake +++ b/cmake/scripts/windowsstore/ArchSetup.cmake @@ -62,7 +62,7 @@ add_options(CXX ALL_BUILDS "/wd\"4146\"") add_options(CXX ALL_BUILDS "/wd\"4251\"") add_options(CXX ALL_BUILDS "/wd\"4668\"") add_options(CXX ALL_BUILDS "/wd\"5033\"") -set(ARCH_DEFINES -D_WINDOWS -DTARGET_WINDOWS -DTARGET_WINDOWS_STORE -DXBMC_EXPORT -DMS_UWP) +set(ARCH_DEFINES -D_WINDOWS -DTARGET_WINDOWS -DTARGET_WINDOWS_STORE -DXBMC_EXPORT -DMS_UWP -DMS_STORE) if(NOT SDK_TARGET_ARCH STREQUAL arm) list(APPEND ARCH_DEFINES -D__SSE__ -D__SSE2__) endif() diff --git a/project/BuildDependencies/scripts/0_package.target-win10-win32.list b/project/BuildDependencies/scripts/0_package.target-win10-win32.list index c1c8a56328..e1f4690872 100644 --- a/project/BuildDependencies/scripts/0_package.target-win10-win32.list +++ b/project/BuildDependencies/scripts/0_package.target-win10-win32.list @@ -27,7 +27,7 @@ libxslt-1.1.29-win10-Win32-v140.7z lzo2-2.09-win10-Win32-v140.7z mini_wdk-10.0.14393.0-win32.7z mysql-connector-c-6.1.9-win10-Win32-v141.7z -openssl-1.0.2o-win10-Win32-v141.7z +openssl-1.1.1b-win10-Win32-v141.7z pcre-8.40-win10-Win32-v141.7z python3-3.7.2-win10-Win32-v141.7z rapidjson-1.1.0-win32.7z diff --git a/project/BuildDependencies/scripts/0_package.target-win10-x64.list b/project/BuildDependencies/scripts/0_package.target-win10-x64.list index 99bb0a9cbd..62fcf3448c 100644 --- a/project/BuildDependencies/scripts/0_package.target-win10-x64.list +++ b/project/BuildDependencies/scripts/0_package.target-win10-x64.list @@ -27,7 +27,7 @@ libxslt-1.1.29-win10-x64-v140.7z lzo2-2.09-win10-x64-v140.7z mini_wdk-10.0.14393.0-win32.7z mysql-connector-c-6.1.9-win10-x64-v141.7z -openssl-1.0.2o-win10-x64-v141.7z +openssl-1.1.1b-win10-x64-v141.7z pcre-8.40-win10-x64-v141.7z python3-3.7.2-win10-x64-v141.7z rapidjson-1.1.0-win32.7z diff --git a/project/BuildDependencies/scripts/0_package.target-win32.list b/project/BuildDependencies/scripts/0_package.target-win32.list index b352618a7e..5f8f341b7e 100644 --- a/project/BuildDependencies/scripts/0_package.target-win32.list +++ b/project/BuildDependencies/scripts/0_package.target-win32.list @@ -33,7 +33,7 @@ libxslt-1.1.29-win32-vc140.7z lzo-2.09-win32-vc140-v3.7z mini_wdk-10.0.14393.0-win32.7z mysql-connector-c-6.1.6-win32-vc140-v2.7z -openssl-1.0.2g-win32-vc140-v2.7z +openssl-1.1.1b-win10-Win32-v141.7z pcre-8.37-win32-vc140-v3.7z python3-3.7.1-Win32-v141.7z rapidjson-1.1.0-win32.7z |