Miroirs/mame
1
0
Fork 0
mirror of https://github.com/mamedev/mame.git synced 2024-11-16 07:48:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove of winstore/winphone

Browse source
This commit is contained in:
Miodrag Milanovic 2021-10-26 11:18:31 +02:00
parent 63f907ee32
commit 9e7455b057
5 changed files with 1 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
makefile
View file

@ -1175,13 +1175,6 @@ ifdef MSBUILD
$(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2019-intel/$(PROJECT_NAME).sln $(MSBUILD_PARAMS)
endif
.PHONY: vs2019_uwp
vs2019_uwp: generate
$(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=winstore82 --osd=uwp --NO_USE_MIDI=1 --NO_OPENGL=1 --USE_QTDEBUG=0 --NO_USE_PORTAUDIO=1 --MODERN_WIN_API=1 vs2019
ifdef MSBUILD
$(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2019-winstore82/$(PROJECT_NAME).sln $(MSBUILD_PARAMS)
endif
#-------------------------------------------------
# android-ndk
#-------------------------------------------------

7
scripts/genie.lua
View file

@ -1239,8 +1239,6 @@ configuration { "vs20*" }
"_CRT_STDIO_LEGACY_WIDE_SPECIFIERS",
}
-- Windows Store/Phone projects already link against the available libraries.
if _OPTIONS["vs"]==nil or not (string.startswith(_OPTIONS["vs"], "winstore8") or string.startswith(_OPTIONS["vs"], "winphone8")) then
links {
"user32",
"winmm",
@ -1253,7 +1251,6 @@ if _OPTIONS["vs"]==nil or not (string.startswith(_OPTIONS["vs"], "winstore8") or
"shell32",
"userenv",
}
end
buildoptions {
"/WX", -- Treats all compiler warnings as errors.
@ -1359,10 +1356,6 @@ end
includedirs {
MAME_DIR .. "3rdparty/dxsdk/Include"
}
configuration { "winphone8* or winstore8*" }
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 { }

24
scripts/src/3rdparty.lua
View file

@ -573,11 +573,6 @@ if _OPTIONS["vs"]=="intel-15" then
}
end
configuration { "winstore*" }
defines {
"NO_GETENV"
}
configuration { }
files {
@ -768,11 +763,6 @@ if _OPTIONS["vs"]=="intel-15" then
"/Qwd869", -- remark #869: parameter "xxx" was never referenced
}
end
configuration { "winstore*" }
forcedincludes {
MAME_DIR .. "src/osd/uwp/uwpcompat.h"
}
configuration { }
defines {
"_7ZIP_PPMD_SUPPPORT",
@ -861,11 +851,6 @@ if _OPTIONS["vs"]=="intel-15" then
}
end
configuration { "winstore*" }
forcedincludes {
MAME_DIR .. "src/osd/uwp/uwpcompat.h",
}
configuration { }
defines {
"LUA_COMPAT_ALL",
@ -961,11 +946,6 @@ end
ext_includedir("sqlite3"),
}
configuration { "winstore*" }
forcedincludes {
MAME_DIR .. "src/osd/uwp/uwpcompat.h"
}
configuration {}
files {
@ -1010,10 +990,6 @@ if _OPTIONS["vs"]=="clangcl" then
"-Wno-implicit-int-float-conversion",
}
end
configuration { "winstore*" }
defines {
"SQLITE_OS_WINRT",
}
configuration { }

32
scripts/src/main.lua
View file

@ -40,8 +40,6 @@ end
"GLESv2",
"SDL2",
}
configuration { "winstore*" }
kind "WindowedApp"
configuration { }
@ -59,36 +57,6 @@ end
}
end
configuration { "winstore*" }
-- Windows Required Files
files {
-- Manifest file
MAME_DIR .. "scripts/resources/uwp/Package.appxmanifest",
}
configuration { "winstore*" }
files {
MAME_DIR .. "scripts/resources/uwp/assets/*.png"
}
configuration "**/scripts/resources/uwp/assets/*.png"
flags { "DeploymentContent" }
-- Effects and Shaders
configuration { "winstore*" }
files {
MAME_DIR .. "artwork/*",
MAME_DIR .. "artwork/**/*",
MAME_DIR .. "bgfx/*",
MAME_DIR .. "bgfx/**/*",
MAME_DIR .. "hash/*",
MAME_DIR .. "language/*",
MAME_DIR .. "language/**/*",
MAME_DIR .. "plugins/*",
MAME_DIR .. "plugins/**/*",
}
configuration "**/*"
flags { "DeploymentContent" }
configuration { "Release" }
targetsuffix ""
if _OPTIONS["PROFILE"] then

31
scripts/toolchain.lua
View file

@ -43,10 +43,6 @@ newoption {
allowed = {
{ "intel-15", "Intel C++ Compiler XE 15.0" },
{ "clangcl", "Visual Studio 2019 using Clang/LLVM" },
{ "winphone8", "Windows Phone 8.0" },
{ "winphone81", "Windows Phone 8.1" },
{ "winstore81", "Windows Store 8.1" },
{ "winstore82", "Universal Windows App" }
},
}
@ -222,29 +218,13 @@ function toolchain(_buildDir, _subDir)
premake.gcc.ar = toolchainPrefix .. "ar"
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-osx-clang")
end
elseif _ACTION == "vs2019" or _ACTION == "vs2019-fastbuild" then
elseif _ACTION == "vs2019" then
if "clangcl" == _OPTIONS["vs"] then
premake.vstudio.toolset = ("ClangCL")
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-clang")
end
if "winstore82" == _OPTIONS["vs"] then
premake.vstudio.toolset = "v142"
premake.vstudio.storeapp = "10.0"
-- If needed, depending on GENie version, enable file-level configuration
if enablefilelevelconfig ~= nil then
enablefilelevelconfig()
end
local action = premake.action.current()
action.vstudio.windowsTargetPlatformVersion = windowsPlatform
platforms { "ARM" }
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winstore82")
end
if "intel-15" == _OPTIONS["vs"] then
premake.vstudio.toolset = "Intel C++ Compiler XE 15.0"
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-intel")
@ -319,15 +299,6 @@ function toolchain(_buildDir, _subDir)
"-Qunused-arguments",
}
configuration { "winphone8* or winstore8*" }
removeflags {
"StaticRuntime",
"NoExceptions",
}
flags {
"WinMain"
}
configuration { "mingw*" }
defines { "WIN32" }