Remove uwp from build system
@ -1,36 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
|
||||
<Identity Name="f0273023-de0a-46a5-b0db-1514f3a84c71" Publisher="CN=bradhugh" Version="1.0.0.0" />
|
||||
<mp:PhoneIdentity PhoneProductId="f0273023-de0a-46a5-b0db-1514f3a84c71" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
|
||||
<Properties>
|
||||
<DisplayName>MAME</DisplayName>
|
||||
<PublisherDisplayName>MAME Team</PublisherDisplayName>
|
||||
<Logo>scripts\resources\uwp\assets\StoreLogo.png</Logo>
|
||||
</Properties>
|
||||
<Dependencies>
|
||||
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
|
||||
</Dependencies>
|
||||
<Resources>
|
||||
<Resource Language="x-generate" />
|
||||
</Resources>
|
||||
<Applications>
|
||||
<Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="Mameuwp.App">
|
||||
<uap:VisualElements DisplayName="MAME" Square150x150Logo="scripts\resources\uwp\assets\Square150x150Logo.png" Square44x44Logo="scripts\resources\uwp\assets\Square44x44Logo.png" Description="MAME for Windows 10" BackgroundColor="transparent">
|
||||
<uap:DefaultTile Wide310x150Logo="scripts\resources\uwp\assets\Wide310x150Logo.png">
|
||||
<uap:ShowNameOnTiles>
|
||||
<uap:ShowOn Tile="square150x150Logo" />
|
||||
</uap:ShowNameOnTiles>
|
||||
</uap:DefaultTile>
|
||||
<uap:SplashScreen Image="scripts\resources\uwp\assets\SplashScreen.scale-200.png" />
|
||||
<uap:InitialRotationPreference>
|
||||
<uap:Rotation Preference="landscape" />
|
||||
</uap:InitialRotationPreference>
|
||||
</uap:VisualElements>
|
||||
</Application>
|
||||
</Applications>
|
||||
<Capabilities>
|
||||
<Capability Name="internetClient" />
|
||||
<Capability Name="codeGeneration" />
|
||||
<Capability Name="privateNetworkClientServer" />
|
||||
</Capabilities>
|
||||
</Package>
|
Before Width: | Height: | Size: 4.4 KiB |
Before Width: | Height: | Size: 243 KiB |
Before Width: | Height: | Size: 27 KiB |
Before Width: | Height: | Size: 6.7 KiB |
Before Width: | Height: | Size: 3.5 KiB |
Before Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 95 KiB |
@ -934,12 +934,9 @@ project "lualibs"
|
||||
|
||||
includedirs {
|
||||
MAME_DIR .. "3rdparty",
|
||||
}
|
||||
if (_OPTIONS["osd"] ~= "uwp") then
|
||||
includedirs {
|
||||
MAME_DIR .. "3rdparty/linenoise",
|
||||
}
|
||||
end
|
||||
|
||||
includedirs {
|
||||
ext_includedir("lua"),
|
||||
ext_includedir("zlib"),
|
||||
@ -952,16 +949,8 @@ end
|
||||
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_none.c",
|
||||
}
|
||||
else
|
||||
files {
|
||||
MAME_DIR .. "3rdparty/lua-linenoise/linenoise.c",
|
||||
}
|
||||
end
|
||||
|
||||
--------------------------------------------------
|
||||
-- SQLite3 library objects
|
||||
@ -2095,7 +2084,6 @@ end
|
||||
-- linenoise library
|
||||
--------------------------------------------------
|
||||
|
||||
if (_OPTIONS["osd"] ~= "uwp") then
|
||||
project "linenoise"
|
||||
uuid "7320ffc8-2748-4add-8864-ae29b72a8511"
|
||||
kind (LIBTYPE)
|
||||
@ -2117,7 +2105,6 @@ project "linenoise"
|
||||
MAME_DIR .. "3rdparty/linenoise/utf8.c",
|
||||
MAME_DIR .. "3rdparty/linenoise/linenoise.c",
|
||||
}
|
||||
end
|
||||
|
||||
|
||||
--------------------------------------------------
|
||||
|
@ -213,12 +213,8 @@ if (STANDALONE~=true) then
|
||||
links {
|
||||
ext_lib("lua"),
|
||||
"lualibs",
|
||||
}
|
||||
if (_OPTIONS["osd"] ~= "uwp") then
|
||||
links {
|
||||
"linenoise",
|
||||
}
|
||||
end
|
||||
end
|
||||
links {
|
||||
ext_lib("zlib"),
|
||||
|
@ -1,122 +0,0 @@
|
||||
-- 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/uwp/video.cpp",
|
||||
MAME_DIR .. "src/osd/uwp/video.h",
|
||||
MAME_DIR .. "src/osd/uwp/window.cpp",
|
||||
MAME_DIR .. "src/osd/uwp/window.h",
|
||||
MAME_DIR .. "src/osd/windows/winutf8.cpp",
|
||||
MAME_DIR .. "src/osd/windows/winutf8.h",
|
||||
MAME_DIR .. "src/osd/modules/osdwindow.cpp",
|
||||
MAME_DIR .. "src/osd/modules/osdwindow.h",
|
||||
MAME_DIR .. "src/osd/windows/winmain.cpp",
|
||||
MAME_DIR .. "src/osd/windows/winmain.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/osdcomm.h",
|
||||
MAME_DIR .. "src/osd/osdcore.cpp",
|
||||
MAME_DIR .. "src/osd/osdcore.h",
|
||||
MAME_DIR .. "src/osd/osdfile.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/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",
|
||||
}
|
@ -1,20 +0,0 @@
|
||||
-- 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",
|
||||
"WIN32_LEAN_AND_MEAN",
|
||||
"NOMINMAX",
|
||||
}
|
||||
|
||||
flags {
|
||||
"Unicode",
|
||||
}
|