aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Fedchin <anightik@gmail.com>2017-10-20 12:54:36 +0300
committerAnton Fedchin <anightik@gmail.com>2017-11-02 09:56:35 +0300
commit9c1d2f26940aa6b397293bc68bfe463c98dde175 (patch)
tree74d7e9498bbee4a4a1fa7e0468eedb4e2ebf8f04
parent6e3071e1b52047628521f5fbcb3e4188be35e0d5 (diff)
[win10] buildsteps: do not make nsis installer for uwp + cosmetics
-rw-r--r--tools/buildsteps/windows/BuildSetup.bat3
-rw-r--r--tools/buildsteps/windows/arm-uwp/BuildSetup.bat2
-rw-r--r--tools/buildsteps/windows/win32-uwp/BuildSetup.bat2
-rw-r--r--tools/buildsteps/windows/x64-uwp/BuildSetup.bat4
4 files changed, 7 insertions, 4 deletions
diff --git a/tools/buildsteps/windows/BuildSetup.bat b/tools/buildsteps/windows/BuildSetup.bat
index 8638f57a09..05bcfc6bce 100644
--- a/tools/buildsteps/windows/BuildSetup.bat
+++ b/tools/buildsteps/windows/BuildSetup.bat
@@ -98,6 +98,7 @@ set WORKSPACE=%base_dir%\kodi-build
POPD
ECHO Done!
ECHO ------------------------------------------------------------
+ IF "%cmakeProps%" NEQ "" GOTO MAKE_APPX
GOTO MAKE_BUILD_EXE
@@ -262,6 +263,8 @@ set WORKSPACE=%base_dir%\kodi-build
ECHO ------------------------------------------------------------
GOTO END
+:MAKE_APPX
+:: todo copy appx to BUILD_WIN32
:END
IF %promptlevel% NEQ noprompt (
ECHO Press any key to exit...
diff --git a/tools/buildsteps/windows/arm-uwp/BuildSetup.bat b/tools/buildsteps/windows/arm-uwp/BuildSetup.bat
index 984cb0e59a..cd19292277 100644
--- a/tools/buildsteps/windows/arm-uwp/BuildSetup.bat
+++ b/tools/buildsteps/windows/arm-uwp/BuildSetup.bat
@@ -2,11 +2,11 @@
SET cmakeGenerator=Visual Studio 14 ARM
SET TARGET_ARCHITECTURE=x86
-SET cmakeProps=-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0.14393.0
rem set Visual C++ build environment for binary addons
call "%VS140COMNTOOLS%..\..\VC\bin\amd64_arm\vcvarsamd64_arm.bat" store 10.0.14393.0 || call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" arm store 10.0.14393.0
+SET cmakeProps=-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=%UCRTVersion%
PUSHD %~dp0\..
CALL BuildSetup.bat %*
POPD
diff --git a/tools/buildsteps/windows/win32-uwp/BuildSetup.bat b/tools/buildsteps/windows/win32-uwp/BuildSetup.bat
index b871dcef06..858cb13d4c 100644
--- a/tools/buildsteps/windows/win32-uwp/BuildSetup.bat
+++ b/tools/buildsteps/windows/win32-uwp/BuildSetup.bat
@@ -2,11 +2,11 @@
SET cmakeGenerator=Visual Studio 14
SET TARGET_ARCHITECTURE=x86
-SET cmakeProps=-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0.14393.0
rem set Visual C++ build environment for binary addons
call "%VS140COMNTOOLS%..\..\VC\bin\amd64_x86\vcvarsamd64_x86.bat" store 10.0.14393.0 || call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x86 store 10.0.14393.0
+SET cmakeProps=-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=%UCRTVersion%
PUSHD %~dp0\..
CALL BuildSetup.bat %*
POPD
diff --git a/tools/buildsteps/windows/x64-uwp/BuildSetup.bat b/tools/buildsteps/windows/x64-uwp/BuildSetup.bat
index f2cdf820d9..a00b3025e8 100644
--- a/tools/buildsteps/windows/x64-uwp/BuildSetup.bat
+++ b/tools/buildsteps/windows/x64-uwp/BuildSetup.bat
@@ -1,12 +1,12 @@
@ECHO OFF
SET cmakeGenerator=Visual Studio 14 Win64
-SET TARGET_ARCHITECTURE=x86
-SET cmakeProps=-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0.14393.0
+SET TARGET_ARCHITECTURE=x64
rem set Visual C++ build environment for binary addons
call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" amd64 store 10.0.14393.0
+SET cmakeProps=-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=%UCRTVersion%
PUSHD %~dp0\..
CALL BuildSetup.bat %*
POPD