summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/3rdparty.lua55
-rw-r--r--scripts/src/bus.lua2
-rw-r--r--scripts/src/machine.lua12
-rw-r--r--scripts/src/netlist.lua2
-rw-r--r--scripts/src/osd/modules.lua1
-rw-r--r--scripts/src/osd/sdl.lua6
-rw-r--r--scripts/src/tools.lua18
7 files changed, 95 insertions, 1 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 9d58a02fbc9..f4926be55e2 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -157,6 +157,12 @@ project "softfloat"
includedirs {
MAME_DIR .. "src/osd",
}
+
+ configuration { "gmake or ninja" }
+ buildoptions_cpp {
+ "-x c++",
+ }
+
configuration { "vs*" }
buildoptions {
"/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
@@ -196,6 +202,11 @@ includedirs {
MAME_DIR .. "3rdparty/softfloat3/source/8086",
}
+configuration { "gmake or ninja" }
+buildoptions_cpp {
+ "-x c++",
+}
+
configuration { "vs*" }
buildoptions {
"/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used
@@ -1198,6 +1209,14 @@ project "bimg"
configuration { }
+ if _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="linux" or _OPTIONS["targetos"]=="windows" then
+ if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then
+ buildoptions_cpp {
+ "-Wno-unused-const-variable",
+ }
+ end
+ end
+
defines {
"__STDC_LIMIT_MACROS",
"__STDC_FORMAT_MACROS",
@@ -1206,11 +1225,25 @@ project "bimg"
includedirs {
MAME_DIR .. "3rdparty/bimg/include",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/include",
}
files {
MAME_DIR .. "3rdparty/bimg/src/image.cpp",
MAME_DIR .. "3rdparty/bimg/src/image_gnf.cpp",
+
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/astc_file.cc",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/codec.cc",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/endpoint_codec.cc",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/footprint.cc",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/integer_sequence_codec.cc",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/intermediate_astc_block.cc",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/logical_astc_block.cc",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/partition.cc",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/physical_astc_block.cc",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/quantization.cc",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/weight_infill.cc",
}
--------------------------------------------------
@@ -1336,12 +1369,30 @@ end
end
end
+ if _OPTIONS["targetos"]=="macosx" and _OPTIONS["gcc"]~=nil then
+ if string.find(_OPTIONS["gcc"], "clang") and (version < 80000) then
+ defines {
+ "TARGET_OS_OSX=1",
+ }
+ end
+ end
+
defines {
"__STDC_LIMIT_MACROS",
"__STDC_FORMAT_MACROS",
"__STDC_CONSTANT_MACROS",
"BGFX_CONFIG_MAX_FRAME_BUFFERS=128",
}
+
+ if _OPTIONS["targetos"]=="linux" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="openbsd" then
+ if _OPTIONS["NO_X11"]=="1" then
+ defines {
+ "BGFX_CONFIG_RENDERER_OPENGLES=1",
+ "BGFX_CONFIG_RENDERER_OPENGL=0",
+ }
+ end
+ end
+
files {
MAME_DIR .. "3rdparty/bgfx/src/bgfx.cpp",
MAME_DIR .. "3rdparty/bgfx/src/debug_renderdoc.cpp",
@@ -1356,6 +1407,7 @@ end
MAME_DIR .. "3rdparty/bgfx/src/renderer_gl.cpp",
MAME_DIR .. "3rdparty/bgfx/src/renderer_gnm.cpp",
MAME_DIR .. "3rdparty/bgfx/src/renderer_noop.cpp",
+ MAME_DIR .. "3rdparty/bgfx/src/renderer_nvn.cpp",
MAME_DIR .. "3rdparty/bgfx/src/renderer_vk.cpp",
MAME_DIR .. "3rdparty/bgfx/src/shader.cpp",
MAME_DIR .. "3rdparty/bgfx/src/shader_dx9bc.cpp",
@@ -1376,6 +1428,9 @@ end
MAME_DIR .. "3rdparty/bgfx/src/glcontext_nsgl.mm",
MAME_DIR .. "3rdparty/bgfx/src/renderer_mtl.mm",
}
+ buildoptions {
+ "-x objective-c++",
+ }
end
--------------------------------------------------
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index d068bf9a1de..46d11bfdb81 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -1257,6 +1257,8 @@ if (BUSES["ISA"]~=null) then
MAME_DIR .. "src/devices/bus/isa/cl_sh260.h",
MAME_DIR .. "src/devices/bus/isa/mpu401.cpp",
MAME_DIR .. "src/devices/bus/isa/mpu401.h",
+ MAME_DIR .. "src/devices/bus/isa/pcmidi.cpp",
+ MAME_DIR .. "src/devices/bus/isa/pcmidi.h",
MAME_DIR .. "src/devices/bus/isa/sblaster.cpp",
MAME_DIR .. "src/devices/bus/isa/sblaster.h",
MAME_DIR .. "src/devices/bus/isa/stereo_fx.cpp",
diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index fb14dd8ba3a..27a5069ce51 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -575,6 +575,18 @@ end
---------------------------------------------------
--
+--@src/devices/machine/adc0804.h,MACHINES["ADC0804"] = true
+---------------------------------------------------
+
+if (MACHINES["ADC0804"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/adc0804.cpp",
+ MAME_DIR .. "src/devices/machine/adc0804.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/machine/adc0808.h,MACHINES["ADC0808"] = true
---------------------------------------------------
diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua
index 81fa3b7c073..6d4c8c909f9 100644
--- a/scripts/src/netlist.lua
+++ b/scripts/src/netlist.lua
@@ -43,7 +43,6 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/nl_dice_compat.h",
MAME_DIR .. "src/lib/netlist/nl_factory.cpp",
MAME_DIR .. "src/lib/netlist/nl_factory.h",
- MAME_DIR .. "src/lib/netlist/nl_lists.h",
MAME_DIR .. "src/lib/netlist/nl_parser.cpp",
MAME_DIR .. "src/lib/netlist/nl_parser.h",
MAME_DIR .. "src/lib/netlist/nl_setup.cpp",
@@ -73,6 +72,7 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/plib/pstate.h",
MAME_DIR .. "src/lib/netlist/plib/pstring.cpp",
MAME_DIR .. "src/lib/netlist/plib/pstring.h",
+ MAME_DIR .. "src/lib/netlist/plib/pstrutil.h",
MAME_DIR .. "src/lib/netlist/plib/pstream.h",
MAME_DIR .. "src/lib/netlist/plib/ptime.h",
MAME_DIR .. "src/lib/netlist/plib/ptypes.h",
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index 4675139f87a..0df5597b254 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -217,6 +217,7 @@ function osdmodulesbuild()
MAME_DIR .. "3rdparty/bgfx/examples/common",
MAME_DIR .. "3rdparty/bgfx/include",
MAME_DIR .. "3rdparty/bgfx/3rdparty",
+ MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos",
MAME_DIR .. "3rdparty/bx/include",
ext_includedir("rapidjson")
}
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index ed660e65f9b..43b1e20e079 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -29,6 +29,12 @@ function maintargetosdoptions(_target,_subtarget)
"X11",
"Xinerama",
}
+ else
+ if _OPTIONS["targetos"]=="linux" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="openbsd" then
+ links {
+ "EGL",
+ }
+ end
end
if _OPTIONS["NO_USE_XINPUT"]~="1" then
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index 25adcfbf7dd..09f8739e30a 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -133,6 +133,15 @@ files {
configuration { "mingw*" or "vs*" }
targetextension ".exe"
+-- workaround for https://developercommunity.visualstudio.com/content/problem/752372/vs2019-v1631-c-internal-compiler-error-when-zi-opt.html
+-- should be fixed in 16.5
+configuration { "Debug", "vs2019" }
+ if _OPTIONS["vs"]==nil then
+ flags {
+ "NoEditAndContinue",
+ }
+ end
+
configuration { }
strip()
@@ -749,6 +758,15 @@ files {
configuration { "mingw*" or "vs*" }
targetextension ".exe"
+-- workaround for https://developercommunity.visualstudio.com/content/problem/752372/vs2019-v1631-c-internal-compiler-error-when-zi-opt.html
+-- should be fixed in 16.5
+configuration { "Debug", "vs2019" }
+ if _OPTIONS["vs"]==nil then
+ flags {
+ "NoEditAndContinue",
+ }
+ end
+
configuration { }
strip()