diff options
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/3rdparty.lua | 104 | ||||
-rw-r--r-- | scripts/src/main.lua | 61 | ||||
-rw-r--r-- | scripts/src/osd/modules.lua | 1 | ||||
-rw-r--r-- | scripts/src/osd/sdl.lua | 6 | ||||
-rw-r--r-- | scripts/src/osd/uwp.lua | 122 | ||||
-rw-r--r-- | scripts/src/osd/uwp_cfg.lua | 20 | ||||
-rw-r--r-- | scripts/src/osd/windows.lua | 1 | ||||
-rw-r--r-- | scripts/src/tests.lua | 4 |
8 files changed, 6 insertions, 313 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index fff3b94f0c8..436a54a3e43 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -573,11 +573,6 @@ if _OPTIONS["vs"]=="intel-15" then } end - configuration { "winstore*" } - defines { - "NO_GETENV" - } - configuration { } files { @@ -667,12 +662,6 @@ end "-include stdint.h" } - configuration { "vsllvm" } - buildoptions { - "-Wno-enum-conversion", - "-Wno-unused-function", - } - configuration { } defines { "WORDS_BIGENDIAN=0", @@ -774,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", @@ -867,27 +851,17 @@ if _OPTIONS["vs"]=="intel-15" then } end - configuration { "winstore*" } - forcedincludes { - MAME_DIR .. "src/osd/uwp/uwpcompat.h", - } - configuration { } defines { "LUA_COMPAT_ALL", "LUA_COMPAT_5_1", "LUA_COMPAT_5_2", } - if not (_OPTIONS["targetos"]=="windows") and not (_OPTIONS["targetos"]=="asmjs") and not (_OPTIONS["targetos"]=="pnacl") then + if not (_OPTIONS["targetos"]=="windows") and not (_OPTIONS["targetos"]=="asmjs") then defines { "LUA_USE_POSIX", } end - if ("pnacl" == _OPTIONS["gcc"]) then - defines { - "LUA_32BITS", - } - end configuration { } @@ -953,11 +927,6 @@ project "lualibs" "/wd4130", -- warning C4130: '==': logical operation on address of string constant } - configuration { "pnacl"} - buildoptions { - "-Wno-char-subscripts", - } - configuration { } defines { "LUA_COMPAT_ALL", @@ -965,39 +934,23 @@ project "lualibs" includedirs { MAME_DIR .. "3rdparty", - } -if (_OPTIONS["osd"] ~= "uwp") then - includedirs { MAME_DIR .. "3rdparty/linenoise", } -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_none.c", - } -else - files { MAME_DIR .. "3rdparty/lua-linenoise/linenoise.c", } -end -------------------------------------------------- -- SQLite3 library objects @@ -1026,16 +979,6 @@ if _OPTIONS["vs"]=="clangcl" then "-Wno-implicit-int-float-conversion", } end - configuration { "winstore*" } - defines { - "SQLITE_OS_WINRT", - } - - configuration { "vsllvm" } - buildoptions { - "-Wno-deprecated-declarations", - "-Wno-unused-variable", - } configuration { } @@ -1160,7 +1103,7 @@ project "bx" MAME_DIR .. "3rdparty/bx/include/compat/mingw", } - configuration { "osx* or xcode4" } + configuration { "osx*" } includedirs { MAME_DIR .. "3rdparty/bx/include/compat/osx", } @@ -1228,7 +1171,7 @@ project "bimg" MAME_DIR .. "3rdparty/bx/include/compat/mingw", } - configuration { "osx* or xcode4" } + configuration { "osx*" } includedirs { MAME_DIR .. "3rdparty/bx/include/compat/osx", } @@ -1300,12 +1243,6 @@ project "bgfx" "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used } - configuration { "vsllvm" } - buildoptions { - "-Wno-unneeded-internal-declaration", - "-Wno-unused-const-variable", - } - if _OPTIONS["vs"]=="intel-15" then buildoptions { "/Qwd906", -- message #906: effect of this "#pragma pack" directive is local to function "xxx" @@ -1321,13 +1258,9 @@ end MAME_DIR .. "3rdparty/bx/include", MAME_DIR .. "3rdparty/bimg/include", MAME_DIR .. "3rdparty/bgfx/3rdparty/dxsdk/include", + MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", } - configuration { "not steamlink"} - includedirs { - MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", - } - configuration { "android-*"} buildoptions { "-Wno-macro-redefined", @@ -1342,7 +1275,7 @@ end MAME_DIR .. "3rdparty/bx/include/compat/mingw", } - configuration { "osx* or xcode4" } + configuration { "osx*" } includedirs { MAME_DIR .. "3rdparty/bx/include/compat/osx", } @@ -1364,14 +1297,6 @@ end "-Wno-unused-function", "-Wno-unused-variable", } - configuration { "rpi" } - buildoptions { - "-Wno-unused-but-set-variable", - "-Wno-unused-variable", - } - defines { - "__STDC_VERSION__=199901L", - } configuration { } @@ -1512,15 +1437,6 @@ project "portaudio" } end - configuration { "vsllvm" } - buildoptions { - "-Wno-deprecated-declarations", - "-Wno-missing-braces", - "-Wno-switch", - "-Wno-unused-function", - "-Wno-unused-variable", - } - configuration { "gmake or ninja" } buildoptions_c { "-Wno-bad-function-cast", @@ -1686,12 +1602,6 @@ if _OPTIONS["targetos"]=="android" then if _OPTIONS["PLATFORM"]=="arm64" then targetdir(MAME_DIR .. "android-project/app/src/main/libs/arm64-v8a") end - if _OPTIONS["PLATFORM"]=="mips" then - targetdir(MAME_DIR .. "android-project/app/src/main/libs/mips") - end - if _OPTIONS["PLATFORM"]=="mips64" then - targetdir(MAME_DIR .. "android-project/app/src/main/libs/mips64") - end if _OPTIONS["PLATFORM"]=="x86" then targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86") end @@ -2174,7 +2084,6 @@ end -- linenoise library -------------------------------------------------- -if (_OPTIONS["osd"] ~= "uwp") then project "linenoise" uuid "7320ffc8-2748-4add-8864-ae29b72a8511" kind (LIBTYPE) @@ -2196,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 992f883f3c8..04cccabc0c0 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -40,17 +40,6 @@ end "GLESv2", "SDL2", } - configuration { "pnacl" } - kind "ConsoleApp" - targetextension ".pexe" - links { - "ppapi", - "ppapi_gles2", - "pthread", - } - - configuration { "winstore*" } - kind "WindowedApp" configuration { } @@ -68,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 @@ -113,9 +72,6 @@ end configuration { "mingw*" or "vs20*" } targetextension ".exe" - configuration { "rpi" } - targetextension "" - configuration { "asmjs" } targetextension ".bc" if os.getenv("EMSCRIPTEN") then @@ -192,12 +148,6 @@ end if _OPTIONS["PLATFORM"]=="arm64" then targetdir(MAME_DIR .. "android-project/app/src/main/libs/arm64-v8a") end - if _OPTIONS["PLATFORM"]=="mips" then - targetdir(MAME_DIR .. "android-project/app/src/main/libs/mips") - end - if _OPTIONS["PLATFORM"]=="mips64" then - targetdir(MAME_DIR .. "android-project/app/src/main/libs/mips64") - end if _OPTIONS["PLATFORM"]=="x86" then targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86") end @@ -263,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"), @@ -419,13 +365,6 @@ if (STANDALONE~=true) then "@echo Emitting ".. rctarget .. "vers.rc...", PYTHON .. " \"" .. path.translate(MAME_DIR .. "scripts/build/verinfo.py","\\") .. "\" -r -b " .. rctarget .. " \"" .. path.translate(GEN_DIR .. "version.cpp","\\") .. "\" > \"" .. path.translate(GEN_DIR .. "resource/" .. rctarget .. "vers.rc", "\\") .. "\"" , } - - configuration { "vsllvm" } - prebuildcommands { - "mkdir \"" .. path.translate(GEN_DIR .. "resource/","\\") .. "\" 2>NUL", - "@echo Emitting ".. rctarget .. "vers.rc...", - PYTHON .. " \"" .. path.translate(MAME_DIR .. "scripts/build/verinfo.py","\\") .. "\" -r -b " .. rctarget .. " \"" .. path.translate(GEN_DIR .. "version.cpp","\\") .. "\" > \"" .. path.translate(GEN_DIR .. "resource/" .. rctarget .. "vers.rc", "\\") .. "\"" , - } end configuration { } diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index 7ee20732784..48f83e126cd 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -104,7 +104,6 @@ function osdmodulesbuild() MAME_DIR .. "src/osd/modules/input/input_xinput.cpp", MAME_DIR .. "src/osd/modules/input/input_xinput.h", MAME_DIR .. "src/osd/modules/input/input_winhybrid.cpp", - MAME_DIR .. "src/osd/modules/input/input_uwp.cpp", MAME_DIR .. "src/osd/modules/input/input_mac.cpp", MAME_DIR .. "src/osd/modules/output/output_module.h", MAME_DIR .. "src/osd/modules/output/none.cpp", diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index fc8fab036d4..25ef22fd3a5 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -381,12 +381,6 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/sdl", } - if _OPTIONS["targetos"]=="windows" then - files { - MAME_DIR .. "src/osd/windows/main.cpp", - } - end - if _OPTIONS["targetos"]=="macosx" then files { MAME_DIR .. "src/osd/modules/debugger/debugosx.mm", 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", -} diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index 2f77844d17a..2d5ca91cca6 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -217,7 +217,6 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/strconv.h", MAME_DIR .. "src/osd/osdsync.cpp", MAME_DIR .. "src/osd/osdsync.h", - MAME_DIR .. "src/osd/windows/main.cpp", MAME_DIR .. "src/osd/windows/winutf8.cpp", MAME_DIR .. "src/osd/windows/winutf8.h", MAME_DIR .. "src/osd/windows/winutil.cpp", diff --git a/scripts/src/tests.lua b/scripts/src/tests.lua index 89c8c976c39..b0164f6946a 100644 --- a/scripts/src/tests.lua +++ b/scripts/src/tests.lua @@ -36,10 +36,6 @@ project("mametests") configuration { "mingw*" or "vs*" } targetextension ".exe" - configuration { "rpi" } - targetextension "" - - configuration { } links { |