diff options
author | 2016-11-09 14:53:19 +0100 | |
---|---|---|
committer | 2016-11-09 14:53:19 +0100 | |
commit | 0d1f5b6be45d6af06b425000525915140d346d08 (patch) | |
tree | f31d95b5307735e620adaa445147d495c76e84fa /scripts/src | |
parent | 5799b36a3a90ef9782341ea019784128e7a9b3ec (diff) |
Make 3rdparty compile for UWP and start adding new OSD for UWP based on previous Brad work (nw)
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/3rdparty.lua | 38 | ||||
-rw-r--r-- | scripts/src/osd/uwp.lua | 109 | ||||
-rw-r--r-- | scripts/src/osd/uwp_cfg.lua | 18 |
3 files changed, 164 insertions, 1 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index fc9e157635b..c1bb26e8e6d 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -197,6 +197,11 @@ if _OPTIONS["vs"]=="intel-15" then } end + configuration { "winstore*" } + defines { + "NO_GETENV" + } + configuration { } files { @@ -377,6 +382,10 @@ end "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration "/wd4457", -- warning C4457: declaration of 'xxx' hides function parameter } + configuration { "winstore*" } + forcedincludes { + MAME_DIR .. "src/osd/uwp/uwpcompat.h" + } configuration { } defines { @@ -463,6 +472,12 @@ if _OPTIONS["vs"]=="intel-15" then "/Qwd592", -- error #592: variable "xxx" is used before its value is set } end + + configuration { "winstore*" } + forcedincludes { + MAME_DIR .. "src/osd/uwp/uwpcompat.h", + } + configuration { } defines { "LUA_COMPAT_ALL", @@ -555,20 +570,35 @@ project "lualibs" includedirs { MAME_DIR .. "3rdparty", + } +if (_OPTIONS["osd"] ~= "uwp") then + includedirs { MAME_DIR .. "3rdparty/linenoise-ng/include", } +end includedirs { ext_includedir("lua"), ext_includedir("zlib"), ext_includedir("sqlite3"), } + configuration { "winstore*" } + forcedincludes { + MAME_DIR .. "src/osd/uwp/uwpcompat.h" + } + + configuration {} + files { MAME_DIR .. "3rdparty/lsqlite3/lsqlite3.c", MAME_DIR .. "3rdparty/lua-zlib/lua_zlib.c", MAME_DIR .. "3rdparty/luafilesystem/src/lfs.c", + } +if (_OPTIONS["osd"] ~= "uwp") then + files { MAME_DIR .. "3rdparty/lua-linenoise/linenoise.c", } +end -------------------------------------------------- -- SQLite3 library objects @@ -591,6 +621,11 @@ if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then "-Wno-incompatible-pointer-types-discards-qualifiers", } end + configuration { "winstore*" } + defines { + "SQLITE_OS_WINRT", + } + configuration { } files { @@ -1514,7 +1549,7 @@ end -------------------------------------------------- -- linenoise-ng library -------------------------------------------------- - +if (_OPTIONS["osd"] ~= "uwp") then project "linenoise-ng" uuid "7320ffc8-2748-4add-8864-ae29b72a8511" kind (LIBTYPE) @@ -1537,3 +1572,4 @@ project "linenoise-ng" MAME_DIR .. "3rdparty/linenoise-ng/src/linenoise.cpp", MAME_DIR .. "3rdparty/linenoise-ng/src/wcwidth.cpp", } +end
\ No newline at end of file diff --git a/scripts/src/osd/uwp.lua b/scripts/src/osd/uwp.lua new file mode 100644 index 00000000000..20540fbe477 --- /dev/null +++ b/scripts/src/osd/uwp.lua @@ -0,0 +1,109 @@ +-- license:BSD-3-Clause +-- copyright-holders:MAMEdev Team + +--------------------------------------------------------------------------- +-- +-- uwp.lua +-- +-- Rules for the building of UWP OSD +-- +--------------------------------------------------------------------------- + +dofile("modules.lua") + +function maintargetosdoptions(_target,_subtarget) +end + +project ("qtdbg_" .. _OPTIONS["osd"]) + uuid (os.uuid("qtdbg_" .. _OPTIONS["osd"])) + kind (LIBTYPE) + + dofile("uwp_cfg.lua") + includedirs { + MAME_DIR .. "src/emu", + MAME_DIR .. "src/devices", -- accessing imagedev from debugger + MAME_DIR .. "src/osd", + MAME_DIR .. "src/lib", + MAME_DIR .. "src/lib/util", + MAME_DIR .. "src/osd/modules/render", + MAME_DIR .. "3rdparty", + } + removeflags { + "SingleOutputDir", + } + + files { + MAME_DIR .. "src/osd/modules/debugger/debugqt.cpp", + } + +project ("osd_" .. _OPTIONS["osd"]) + uuid (os.uuid("osd_" .. _OPTIONS["osd"])) + kind (LIBTYPE) + + removeflags { + "SingleOutputDir", + } + + dofile("uwp_cfg.lua") + osdmodulesbuild() + + includedirs { + MAME_DIR .. "src/emu", + MAME_DIR .. "src/devices", -- accessing imagedev from debugger + MAME_DIR .. "src/osd", + MAME_DIR .. "src/lib", + MAME_DIR .. "src/lib/util", + MAME_DIR .. "src/osd/modules/file", + MAME_DIR .. "src/osd/modules/render", + MAME_DIR .. "3rdparty", + } + + includedirs { + MAME_DIR .. "src/osd/uwp", + MAME_DIR .. "src/osd/windows", + } + + files { + MAME_DIR .. "src/osd/modules/osdwindow.cpp", + MAME_DIR .. "src/osd/modules/osdwindow.h", + MAME_DIR .. "src/osd/modules/render/drawnone.cpp", + 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/osdepend.h", + } + +project ("ocore_" .. _OPTIONS["osd"]) + uuid (os.uuid("ocore_" .. _OPTIONS["osd"])) + kind (LIBTYPE) + + removeflags { + "SingleOutputDir", + } + + dofile("uwp_cfg.lua") + + includedirs { + MAME_DIR .. "3rdparty", + MAME_DIR .. "src/emu", + MAME_DIR .. "src/osd", + MAME_DIR .. "src/osd/modules/file", + MAME_DIR .. "src/lib", + MAME_DIR .. "src/lib/util", + } + + files { + MAME_DIR .. "src/osd/osdnet.cpp", + MAME_DIR .. "src/osd/osdnet.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/windows/winutil.cpp", + MAME_DIR .. "src/osd/windows/winutil.h", + --MAME_DIR .. "src/osd/modules/lib/osdlib_uwp.cpp", + } diff --git a/scripts/src/osd/uwp_cfg.lua b/scripts/src/osd/uwp_cfg.lua new file mode 100644 index 00000000000..234327aada0 --- /dev/null +++ b/scripts/src/osd/uwp_cfg.lua @@ -0,0 +1,18 @@ +-- license:BSD-3-Clause +-- copyright-holders:MAMEdev Team + +defines { + "OSD_UWP=1", + "USE_QTDEBUG=0", + "SDLMAME_NOASM=1", + "USE_OPENGL=0", + "NO_USE_MIDI=1", + "WINVER=0x0603", + "_WIN32_WINNT=0x0603", + "NTDDI_VERSION=0x06030000", + "MODERN_WIN_API", +} + +flags { + "Unicode", +} |