diff options
author | 2021-10-26 11:24:03 +0200 | |
---|---|---|
committer | 2021-10-26 11:24:03 +0200 | |
commit | 9d61cf33d156aab6ad7c003cafecaa3303444bc4 (patch) | |
tree | e6c728b2ca12b98a0e64cff2306cdff95e561eaa | |
parent | 9e7455b0578033442ee76b360b2b2c3fc577c81f (diff) |
Remove uwp from build system
-rw-r--r-- | scripts/resources/uwp/Package.appxmanifest | 36 | ||||
-rw-r--r-- | scripts/resources/uwp/assets/LockScreenLogo.scale-200.png | bin | 4544 -> 0 bytes | |||
-rw-r--r-- | scripts/resources/uwp/assets/SplashScreen.scale-200.png | bin | 249008 -> 0 bytes | |||
-rw-r--r-- | scripts/resources/uwp/assets/Square150x150Logo.scale-200.png | bin | 27658 -> 0 bytes | |||
-rw-r--r-- | scripts/resources/uwp/assets/Square44x44Logo.scale-200.png | bin | 6817 -> 0 bytes | |||
-rw-r--r-- | scripts/resources/uwp/assets/Square44x44Logo.targetsize-24_altform-unplated.png | bin | 3589 -> 0 bytes | |||
-rw-r--r-- | scripts/resources/uwp/assets/StoreLogo.png | bin | 4705 -> 0 bytes | |||
-rw-r--r-- | scripts/resources/uwp/assets/Wide310x150Logo.scale-200.png | bin | 97655 -> 0 bytes | |||
-rw-r--r-- | scripts/resources/uwp/mame_TemporaryKey.pfx | bin | 2454 -> 0 bytes | |||
-rw-r--r-- | scripts/src/3rdparty.lua | 15 | ||||
-rw-r--r-- | scripts/src/main.lua | 4 | ||||
-rw-r--r-- | scripts/src/osd/uwp.lua | 122 | ||||
-rw-r--r-- | scripts/src/osd/uwp_cfg.lua | 20 |
13 files changed, 1 insertions, 196 deletions
diff --git a/scripts/resources/uwp/Package.appxmanifest b/scripts/resources/uwp/Package.appxmanifest deleted file mode 100644 index 60092db9fed..00000000000 --- a/scripts/resources/uwp/Package.appxmanifest +++ /dev/null @@ -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>
\ No newline at end of file diff --git a/scripts/resources/uwp/assets/LockScreenLogo.scale-200.png b/scripts/resources/uwp/assets/LockScreenLogo.scale-200.png Binary files differdeleted file mode 100644 index 989319d4ec3..00000000000 --- a/scripts/resources/uwp/assets/LockScreenLogo.scale-200.png +++ /dev/null diff --git a/scripts/resources/uwp/assets/SplashScreen.scale-200.png b/scripts/resources/uwp/assets/SplashScreen.scale-200.png Binary files differdeleted file mode 100644 index 538a6ad95a9..00000000000 --- a/scripts/resources/uwp/assets/SplashScreen.scale-200.png +++ /dev/null diff --git a/scripts/resources/uwp/assets/Square150x150Logo.scale-200.png b/scripts/resources/uwp/assets/Square150x150Logo.scale-200.png Binary files differdeleted file mode 100644 index 15b8043caa8..00000000000 --- a/scripts/resources/uwp/assets/Square150x150Logo.scale-200.png +++ /dev/null diff --git a/scripts/resources/uwp/assets/Square44x44Logo.scale-200.png b/scripts/resources/uwp/assets/Square44x44Logo.scale-200.png Binary files differdeleted file mode 100644 index 420dc54bf73..00000000000 --- a/scripts/resources/uwp/assets/Square44x44Logo.scale-200.png +++ /dev/null diff --git a/scripts/resources/uwp/assets/Square44x44Logo.targetsize-24_altform-unplated.png b/scripts/resources/uwp/assets/Square44x44Logo.targetsize-24_altform-unplated.png Binary files differdeleted file mode 100644 index ba31e4f883f..00000000000 --- a/scripts/resources/uwp/assets/Square44x44Logo.targetsize-24_altform-unplated.png +++ /dev/null diff --git a/scripts/resources/uwp/assets/StoreLogo.png b/scripts/resources/uwp/assets/StoreLogo.png Binary files differdeleted file mode 100644 index a16e59dcee9..00000000000 --- a/scripts/resources/uwp/assets/StoreLogo.png +++ /dev/null diff --git a/scripts/resources/uwp/assets/Wide310x150Logo.scale-200.png b/scripts/resources/uwp/assets/Wide310x150Logo.scale-200.png Binary files differdeleted file mode 100644 index b6fd1f57bca..00000000000 --- a/scripts/resources/uwp/assets/Wide310x150Logo.scale-200.png +++ /dev/null diff --git a/scripts/resources/uwp/mame_TemporaryKey.pfx b/scripts/resources/uwp/mame_TemporaryKey.pfx Binary files differdeleted file mode 100644 index de6ef5c5f88..00000000000 --- a/scripts/resources/uwp/mame_TemporaryKey.pfx +++ /dev/null diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index f2dcf55d39b..436a54a3e43 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -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 -------------------------------------------------- diff --git a/scripts/src/main.lua b/scripts/src/main.lua index 5ad6aa77d7f..04cccabc0c0 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -213,13 +213,9 @@ if (STANDALONE~=true) then links { ext_lib("lua"), "lualibs", - } -if (_OPTIONS["osd"] ~= "uwp") then - links { "linenoise", } end -end links { ext_lib("zlib"), ext_lib("flac"), diff --git a/scripts/src/osd/uwp.lua b/scripts/src/osd/uwp.lua deleted file mode 100644 index 1cb0eef5c75..00000000000 --- a/scripts/src/osd/uwp.lua +++ /dev/null @@ -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", - } diff --git a/scripts/src/osd/uwp_cfg.lua b/scripts/src/osd/uwp_cfg.lua deleted file mode 100644 index 28892656728..00000000000 --- a/scripts/src/osd/uwp_cfg.lua +++ /dev/null @@ -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", -} |