summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/3rdparty.lua6
-rw-r--r--scripts/src/emu.lua5
-rw-r--r--scripts/src/lib.lua1
-rw-r--r--scripts/src/main.lua9
-rw-r--r--scripts/src/osd/sdl.lua122
-rw-r--r--scripts/src/osd/windows.lua1
-rw-r--r--scripts/src/tools.lua42
7 files changed, 55 insertions, 131 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 30cb3770a4a..7666f4d9e09 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -765,14 +765,14 @@ end
MAME_DIR .. "3rdparty/bgfx/src/glcontext_ppapi.cpp",
MAME_DIR .. "3rdparty/bgfx/src/glcontext_wgl.cpp",
MAME_DIR .. "3rdparty/bgfx/src/image.cpp",
- MAME_DIR .. "3rdparty/bgfx/src/ovr.cpp",
+ MAME_DIR .. "3rdparty/bgfx/src/hmd_ovr.cpp",
MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d12.cpp",
MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d11.cpp",
MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d9.cpp",
MAME_DIR .. "3rdparty/bgfx/src/renderer_gl.cpp",
MAME_DIR .. "3rdparty/bgfx/src/renderer_null.cpp",
MAME_DIR .. "3rdparty/bgfx/src/renderer_vk.cpp",
- MAME_DIR .. "3rdparty/bgfx/src/renderdoc.cpp",
+ MAME_DIR .. "3rdparty/bgfx/src/debug_renderdoc.cpp",
MAME_DIR .. "3rdparty/bgfx/src/shader.cpp",
MAME_DIR .. "3rdparty/bgfx/src/shader_dxbc.cpp",
MAME_DIR .. "3rdparty/bgfx/src/shader_dx9bc.cpp",
@@ -1187,7 +1187,7 @@ if _OPTIONS["targetos"]=="android" then
"log",
}
linkoptions {
- "-Wl,-soname,liSDL2.so"
+ "-Wl,-soname,libSDL2.so"
}
if _OPTIONS["SEPARATE_BIN"]~="1" then
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua
index efe30edbb1d..e2fe63f5e10 100644
--- a/scripts/src/emu.lua
+++ b/scripts/src/emu.lua
@@ -34,6 +34,7 @@ includedirs {
includedirs {
ext_includedir("expat"),
ext_includedir("lua"),
+ ext_includedir("zlib"),
ext_includedir("flac"),
}
@@ -205,6 +206,8 @@ files {
MAME_DIR .. "src/emu/ui/devctrl.h",
MAME_DIR .. "src/emu/ui/menu.cpp",
MAME_DIR .. "src/emu/ui/menu.h",
+ MAME_DIR .. "src/emu/ui/submenu.cpp",
+ MAME_DIR .. "src/emu/ui/submenu.h",
MAME_DIR .. "src/emu/ui/mainmenu.cpp",
MAME_DIR .. "src/emu/ui/mainmenu.h",
MAME_DIR .. "src/emu/ui/miscmenu.cpp",
@@ -405,6 +408,7 @@ dependency {
{ MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/vertical.lh" },
{ MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/lcd.lh" },
{ MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/lcd_rot.lh" },
+ { MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/svg.lh" },
{ MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/noscreens.lh" },
{ MAME_DIR .. "src/emu/video.cpp", GEN_DIR .. "emu/layout/snap.lh" },
@@ -427,6 +431,7 @@ custombuildtask {
layoutbuildtask("emu/layout", "vertical"),
layoutbuildtask("emu/layout", "lcd"),
layoutbuildtask("emu/layout", "lcd_rot"),
+ layoutbuildtask("emu/layout", "svg"),
layoutbuildtask("emu/layout", "noscreens"),
layoutbuildtask("emu/layout", "snap"),
}
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua
index c43bbecb291..3c84b7a9ac9 100644
--- a/scripts/src/lib.lua
+++ b/scripts/src/lib.lua
@@ -64,6 +64,7 @@ project "utils"
MAME_DIR .. "src/lib/util/jedparse.h",
MAME_DIR .. "src/lib/util/md5.cpp",
MAME_DIR .. "src/lib/util/md5.h",
+ MAME_DIR .. "src/lib/util/nanosvg.cpp",
MAME_DIR .. "src/lib/util/opresolv.cpp",
MAME_DIR .. "src/lib/util/opresolv.h",
MAME_DIR .. "src/lib/util/options.cpp",
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 93c0dd12140..7d97eae1c1c 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -125,7 +125,7 @@ end
emccopts = emccopts .. " -s EXCEPTION_CATCHING_WHITELIST='[\"__ZN15running_machine17start_all_devicesEv\",\"__ZN12cli_frontend7executeEiPPc\"]'"
emccopts = emccopts .. " -s EXPORTED_FUNCTIONS=\"['_main', '_malloc', '__Z14js_get_machinev', '__Z9js_get_uiv', '__Z12js_get_soundv', '__ZN10ui_manager12set_show_fpsEb', '__ZNK10ui_manager8show_fpsEv', '__ZN13sound_manager4muteEbh', '_SDL_PauseAudio']\""
emccopts = emccopts .. " --pre-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/modules/sound/js_sound.js"
- emccopts = emccopts .. " --post-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/sdl/emscripten_post.js"
+ emccopts = emccopts .. " --post-js " .. _MAKE.esc(MAME_DIR) .. "scripts/resources/emscripten/emscripten_post.js"
emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/chains@bgfx/chains"
emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/effects@bgfx/effects"
emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/shaders/gles@bgfx/shaders/gles"
@@ -255,10 +255,7 @@ end
local rctarget = _subtarget
if _OPTIONS["targetos"]=="windows" and (not override_resources) then
- local rcfile = MAME_DIR .. "src/" .. _target .. "/osd/".._OPTIONS["osd"].."/" .. _subtarget .. "/" .. rctarget ..".rc"
- if not os.isfile(rcfile) then
- rcfile = MAME_DIR .. "src/" .. _target .. "/osd/windows/" .. _subtarget .. "/" .. rctarget ..".rc"
- end
+ rcfile = MAME_DIR .. "scripts/resources/windows/" .. _subtarget .. "/" .. rctarget ..".rc"
if os.isfile(rcfile) then
files {
rcfile,
@@ -269,7 +266,7 @@ end
else
rctarget = "mame"
files {
- MAME_DIR .. "src/mame/osd/windows/mame/mame.rc",
+ MAME_DIR .. "scripts/resources/windows/mame/mame.rc",
}
dependency {
{ "$(OBJDIR)/mame.res" , GEN_DIR .. "resource/" .. rctarget .. "vers.rc", true },
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index f1d307b8cab..bdef2c5fad3 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -368,7 +368,7 @@ project ("osd_" .. _OPTIONS["osd"])
if _OPTIONS["targetos"]=="windows" then
files {
- MAME_DIR .. "src/osd/sdl/main.cpp",
+ MAME_DIR .. "src/osd/windows/main.cpp",
}
end
@@ -461,7 +461,6 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/strconv.cpp",
MAME_DIR .. "src/osd/strconv.h",
MAME_DIR .. "src/osd/sdl/sdldir.cpp",
- MAME_DIR .. "src/osd/sdl/sdlos_" .. SDLOS_TARGETOS .. ".cpp",
MAME_DIR .. "src/osd/modules/osdmodule.cpp",
MAME_DIR .. "src/osd/modules/osdmodule.h",
MAME_DIR .. "src/osd/modules/lib/osdlib_" .. SDLOS_TARGETOS .. ".cpp",
@@ -495,123 +494,4 @@ project ("ocore_" .. _OPTIONS["osd"])
}
end
- if _OPTIONS["targetos"]=="macosx" then
- files {
- MAME_DIR .. "src/osd/sdl/osxutils.h",
- MAME_DIR .. "src/osd/sdl/osxutils.mm",
- }
- end
-
-
---------------------------------------------------
--- testkeys
---------------------------------------------------
-
-if _OPTIONS["with-tools"] then
- project("testkeys")
- uuid ("744cec21-c3b6-4d69-93cb-6811fed0ffe3")
- kind "ConsoleApp"
-
- flags {
- "Symbols", -- always include minimum symbols for executables
- }
-
- dofile("sdl_cfg.lua")
-
- includedirs {
- MAME_DIR .. "src/osd",
- MAME_DIR .. "src/lib/util",
- }
-
- if _OPTIONS["SEPARATE_BIN"]~="1" then
- targetdir(MAME_DIR)
- end
-
- links {
- "utils",
- "ocore_" .. _OPTIONS["osd"],
- }
-
- files {
- MAME_DIR .. "src/osd/sdl/testkeys.cpp",
- }
-
- if _OPTIONS["targetos"] == "windows" then
- if _OPTIONS["USE_LIBSDL"]~="1" then
- configuration { "mingw*"}
- links {
- "SDL2.dll",
- }
- configuration { "vs*" }
- links {
- "SDL2",
- "Imm32",
- "Version",
- }
- configuration { }
- else
- local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'")
- addlibfromstring(str)
- addoptionsfromstring(str)
- end
- links {
- "psapi",
- }
- linkoptions{
- "-municode",
- }
- files {
- MAME_DIR .. "src/osd/sdl/main.cpp",
- }
- end
-
- configuration { "mingw*" or "vs*" }
- targetextension ".exe"
-
- configuration { }
-
- strip()
-end
-
-
---------------------------------------------------
--- aueffectutil
---------------------------------------------------
-
-if _OPTIONS["targetos"] == "macosx" and _OPTIONS["with-tools"] then
- project("aueffectutil")
- uuid ("3db8316d-fad7-4f5b-b46a-99373c91550e")
- kind "ConsoleApp"
- flags {
- "Symbols", -- always include minimum symbols for executables
- }
-
- dofile("sdl_cfg.lua")
-
- if _OPTIONS["SEPARATE_BIN"]~="1" then
- targetdir(MAME_DIR)
- end
-
- linkoptions {
- "-sectcreate __TEXT __info_plist " .. MAME_DIR .. "src/osd/sdl/aueffectutil-Info.plist",
- }
-
- dependency {
- { "aueffectutil", MAME_DIR .. "src/osd/sdl/aueffectutil-Info.plist", true },
- }
-
- links {
- "AudioUnit.framework",
- "AudioToolbox.framework",
- "CoreAudio.framework",
- "CoreAudioKit.framework",
- "CoreServices.framework",
- }
-
- files {
- MAME_DIR .. "src/osd/sdl/aueffectutil.mm",
- }
-
- strip()
-end
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index f9a886dc176..eb1fd828226 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -253,7 +253,6 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/windows/winutf8.h",
MAME_DIR .. "src/osd/windows/winutil.cpp",
MAME_DIR .. "src/osd/windows/winutil.h",
- MAME_DIR .. "src/osd/windows/winclip.cpp",
MAME_DIR .. "src/osd/modules/osdmodule.cpp",
MAME_DIR .. "src/osd/modules/osdmodule.h",
MAME_DIR .. "src/osd/modules/file/winfile.cpp",
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index 913358f1d20..a2e5ad73496 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -741,3 +741,45 @@ configuration { "mingw*" or "vs*" }
configuration { }
strip()
+
+--------------------------------------------------
+-- aueffectutil
+--------------------------------------------------
+
+if _OPTIONS["targetos"] == "macosx" then
+ project("aueffectutil")
+ uuid ("3db8316d-fad7-4f5b-b46a-99373c91550e")
+ kind "ConsoleApp"
+
+ flags {
+ "Symbols", -- always include minimum symbols for executables
+ }
+
+ if _OPTIONS["SEPARATE_BIN"]~="1" then
+ targetdir(MAME_DIR)
+ end
+
+ linkoptions {
+ "-sectcreate __TEXT __info_plist " .. MAME_DIR .. "src/tools/aueffectutil-Info.plist",
+ }
+
+ dependency {
+ { "aueffectutil", MAME_DIR .. "src/tools/aueffectutil-Info.plist", true },
+ }
+
+ links {
+ "AudioUnit.framework",
+ "AudioToolbox.framework",
+ "CoreAudio.framework",
+ "CoreAudioKit.framework",
+ "CoreServices.framework",
+ }
+
+ files {
+ MAME_DIR .. "src/tools/aueffectutil.mm",
+ }
+
+ configuration { }
+
+ strip()
+end