diff options
author | 2016-11-10 13:13:51 +0100 | |
---|---|---|
committer | 2016-11-10 13:13:51 +0100 | |
commit | a18497e7a24d931e7ab1dda9d79fee484e5aa170 (patch) | |
tree | ca2314adb3c00fe78937bb646b4775921cb207ab /scripts | |
parent | 9d184119993471958397324fcc4c38040cd0096b (diff) |
Some more work on UWP (nw)
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/src/3rdparty.lua | 6 | ||||
-rw-r--r-- | scripts/src/main.lua | 30 | ||||
-rw-r--r-- | scripts/src/osd/uwp.lua | 18 | ||||
-rw-r--r-- | scripts/toolchain.lua | 3 |
4 files changed, 50 insertions, 7 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index c1bb26e8e6d..79d131a63dc 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -594,7 +594,11 @@ end MAME_DIR .. "3rdparty/lua-zlib/lua_zlib.c", MAME_DIR .. "3rdparty/luafilesystem/src/lfs.c", } -if (_OPTIONS["osd"] ~= "uwp") then +if (_OPTIONS["osd"] == "uwp") then + files { + MAME_DIR .. "3rdparty/lua-linenoise/linenoise_none.c", + } +else files { MAME_DIR .. "3rdparty/lua-linenoise/linenoise.c", } diff --git a/scripts/src/main.lua b/scripts/src/main.lua index f1c33edd84b..84458f9fe89 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -48,6 +48,10 @@ end "ppapi_gles2", "pthread", } + + configuration { "winstore*" } + kind "WindowedApp" + configuration { } addprojectflags() @@ -69,6 +73,32 @@ end "Unicode", } + configuration { "winstore*" } + -- Windows Required Files + files { + -- Manifest file + MAME_DIR .. "src/osd/uwp/Package.appxmanifest", + } + + configuration { "winstore*" } + files { + MAME_DIR .. "src/osd/uwp/assets/*.png" + } + configuration "**/src/osd/uwp/assets/*.png" + flags { "DeploymentContent" } + + -- Effects and Shaders + configuration { "winstore*" } + files { + MAME_DIR .. "artwork/**/*", + MAME_DIR .. "bgfx/**/*", + MAME_DIR .. "hash/*", + MAME_DIR .. "language/**/*", + MAME_DIR .. "plugins/**/*", + } + configuration "**/*" + flags { "DeploymentContent" } + configuration { "x64", "Release" } targetsuffix "64" if _OPTIONS["PROFILE"] then diff --git a/scripts/src/osd/uwp.lua b/scripts/src/osd/uwp.lua index 20540fbe477..fdaec08a3c7 100644 --- a/scripts/src/osd/uwp.lua +++ b/scripts/src/osd/uwp.lua @@ -70,6 +70,8 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/render/drawnone.h", MAME_DIR .. "src/osd/uwp/uwpcompat.cpp", MAME_DIR .. "src/osd/uwp/uwpcompat.h", + MAME_DIR .. "src/osd/uwp/uwpmain.cpp", + MAME_DIR .. "src/osd/uwp/uwpmain.h", MAME_DIR .. "src/osd/osdepend.h", } @@ -93,17 +95,21 @@ project ("ocore_" .. _OPTIONS["osd"]) } files { - MAME_DIR .. "src/osd/osdnet.cpp", - MAME_DIR .. "src/osd/osdnet.h", + MAME_DIR .. "src/osd/osdcomm.h", MAME_DIR .. "src/osd/osdcore.cpp", MAME_DIR .. "src/osd/osdcore.h", - MAME_DIR .. "src/osd/modules/osdmodule.cpp", - MAME_DIR .. "src/osd/modules/osdmodule.h", MAME_DIR .. "src/osd/strconv.cpp", MAME_DIR .. "src/osd/strconv.h", MAME_DIR .. "src/osd/osdsync.cpp", - MAME_DIR .. "src/osd/osdsync.h", + MAME_DIR .. "src/osd/osdsync.h", MAME_DIR .. "src/osd/windows/winutil.cpp", MAME_DIR .. "src/osd/windows/winutil.h", - --MAME_DIR .. "src/osd/modules/lib/osdlib_uwp.cpp", + MAME_DIR .. "src/osd/modules/osdmodule.cpp", + MAME_DIR .. "src/osd/modules/osdmodule.h", + MAME_DIR .. "src/osd/modules/file/winrtdir.cpp", + MAME_DIR .. "src/osd/modules/file/winrtfile.cpp", + MAME_DIR .. "src/osd/modules/file/winrtfile.h", + MAME_DIR .. "src/osd/modules/file/winrtptty.cpp", + MAME_DIR .. "src/osd/modules/file/winrtsocket.cpp", + MAME_DIR .. "src/osd/modules/lib/osdlib_uwp.cpp", } diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 6f5476bdd0a..99a3647b6ec 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -468,6 +468,9 @@ function toolchain(_buildDir, _subDir) "StaticRuntime", "NoExceptions", } + flags { + "WinMain" + } configuration { "mingw*" } defines { "WIN32" } |