diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2015-05-28 20:06:33 +0200 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2015-05-28 20:06:33 +0200 |
commit | 548a982a3cde7ff84e557f0ff4e15b38553b0462 (patch) | |
tree | 29b828914bd6b94f1853b0a5efa77a473f432cc0 | |
parent | a92760b406f6d1ecf1e249aedea39207ed3f2b37 (diff) |
Added skeleton support for Windows Phone and Windows Store - far from working(nw)
-rw-r--r-- | makefile | 3 | ||||
-rw-r--r-- | scripts/genie.lua | 15 | ||||
-rw-r--r-- | scripts/toolchain.lua | 25 |
3 files changed, 42 insertions, 1 deletions
@@ -737,6 +737,9 @@ vs2013_xp: generate vs2013_clang: generate $(SILENT) $(GENIE) $(PARAMS) --vs=vs2013-clang vs2013 +vs2013_winrt: generate + $(SILENT) $(GENIE) $(PARAMS) --vs=winstore81 vs2013 + vs2015: generate $(SILENT) $(GENIE) $(PARAMS) vs2015 diff --git a/scripts/genie.lua b/scripts/genie.lua index 10eed679dfb..f3b01f9dab0 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -1097,6 +1097,21 @@ configuration { "x64", "vs*" } MAME_DIR .. "3rdparty/dxsdk/lib/x64", } +configuration { "winphone8* or winstore8*" } + removelinks { + "DelayImp", + "gdi32", + "psapi" + } + links { + "d3d11", + "dxgi" + } + linkoptions { + "/ignore:4264" -- LNK4264: archiving object file compiled with /ZW into a static library; note that when authoring Windows Runtime types it is not recommended to link with a static library that contains Windows Runtime metadata + } + + configuration { } diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 86998b83813..91d1f29884e 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -46,6 +46,8 @@ newoption { { "vs2013-xp", "Visual Studio 2013 targeting XP" }, { "winphone8", "Windows Phone 8.0" }, { "winphone81", "Windows Phone 8.1" }, + { "winstore81", "Windows Store 8.1" }, + { "winstore82", "Universal Windows App" } }, } @@ -317,6 +319,20 @@ function toolchain(_buildDir, _subDir) location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winphone81") end + if "winstore81" == _OPTIONS["vs"] then + premake.vstudio.toolset = "v120" + premake.vstudio.storeapp = "8.1" + platforms { "ARM" } + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winstore81") + end + + if "winstore82" == _OPTIONS["vs"] then + premake.vstudio.toolset = "v140" + premake.vstudio.storeapp = "8.2" + platforms { "ARM" } + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winstore82") + end + if "intel-14" == _OPTIONS["vs"] then premake.vstudio.toolset = "Intel C++ Compiler XE 14.0" location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-intel") @@ -407,12 +423,19 @@ function toolchain(_buildDir, _subDir) configuration { "x64", "vs*-clang", "Debug" } targetdir (_buildDir .. _ACTION .. "-clang/bin/x64/Debug") - + configuration { "vs*-clang" } buildoptions { "-Qunused-arguments", } + configuration { "winphone8* or winstore8*" } + removeflags { + "StaticRuntime", + "NoExceptions", + "EnableMinimalRebuild", + } + configuration { "mingw*" } defines { "WIN32" } |