summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Brad Hughes <bradhugh@outlook.com>2016-03-22 18:47:41 -0400
committer Brad Hughes <bradhugh@outlook.com>2016-03-22 18:50:55 -0400
commite7c1d090004d9b42840b34725f99e0501b713ae9 (patch)
tree4ce64109426cc346661539d71637c9a5e6ff8f85
parent8b743a0cf5b6efcc438e79d1716d1e7d15dc89c7 (diff)
parente6e30bb9dd91af8656f4f7db4bc947e5e9186e1f (diff)
Merge: Build project for Windows Store
-rw-r--r--makefile7
-rw-r--r--scripts/toolchain.lua20
2 files changed, 27 insertions, 0 deletions
diff --git a/makefile b/makefile
index b71fc5f96cb..4e28577c17c 100644
--- a/makefile
+++ b/makefile
@@ -957,6 +957,13 @@ ifdef MSBUILD
$(SILENT) msbuild $(PROJECTDIR_WIN)/vs2015-xp/$(PROJECT_NAME).sln $(MSBUILD_PARAMS)
endif
+.PHONY: vs2015_uwp
+vs2015_uwp: generate
+ $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=winstore82 --osd=windows --NO_USE_MIDI=1 --USE_LIBUV=0 --NO_OPENGL=1 --USE_QTDEBUG=0 --MODERN_WIN_API=1 vs2015
+ifdef MSBUILD
+ $(SILENT) msbuild $(PROJECTDIR_WIN)/vs2015-winstore82/$(PROJECT_NAME).sln $(MSBUILD_PARAMS)
+endif
+
#-------------------------------------------------
# android-arm
#-------------------------------------------------
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 408237d783e..b23ea3f597d 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -80,6 +80,12 @@ newoption {
description = "Set iOS target version (default: 8.0).",
}
+newoption {
+ trigger = "with-windows",
+ value = "#",
+ description = "Set the Windows target platform version (default: 10.0.10240.0).",
+}
+
function toolchain(_buildDir, _subDir)
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION)
@@ -93,6 +99,11 @@ function toolchain(_buildDir, _subDir)
if _OPTIONS["with-ios"] then
iosPlatform = _OPTIONS["with-ios"]
end
+
+ local windowsPlatform = "10.0.10240.0"
+ if _OPTIONS["with-windows"] then
+ windowsPlatform = _OPTIONS["with-windows"]
+ end
if _ACTION == "gmake" then
@@ -370,6 +381,15 @@ function toolchain(_buildDir, _subDir)
if "winstore82" == _OPTIONS["vs"] then
premake.vstudio.toolset = "v140"
premake.vstudio.storeapp = "8.2"
+
+ -- If needed, depending on GENie version, enable file-level configuration
+ if enablefilelevelconfig ~= nil then
+ enablefilelevelconfig()
+ end
+
+ local action = premake.action.current()
+ action.vstudio.windowsTargetPlatformVersion = windowsPlatform
+
platforms { "ARM" }
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winstore82")
end