summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/3rdparty.lua193
-rw-r--r--scripts/src/bus.lua30
-rw-r--r--scripts/src/lib.lua6
-rw-r--r--scripts/src/machine.lua12
-rw-r--r--scripts/src/main.lua5
-rw-r--r--scripts/src/netlist.lua16
-rw-r--r--scripts/src/tests.lua42
-rw-r--r--scripts/src/tools.lua2
8 files changed, 291 insertions, 15 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index aac32bfad74..bba91c7835e 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -604,3 +604,196 @@ project "bgfx"
}
end
end
+
+--------------------------------------------------
+-- PortAudio library objects
+--------------------------------------------------
+
+project "portaudio"
+ uuid "0755c5f5-eccf-47f3-98a9-df67018a94d4"
+ kind "StaticLib"
+
+ configuration { "gmake" }
+ buildoptions_c {
+ "-Wno-strict-prototypes",
+ "-Wno-bad-function-cast",
+ "-Wno-undef",
+ "-Wno-missing-braces",
+ "-Wno-unused-but-set-variable",
+ "-Wno-maybe-uninitialized",
+ "-Wno-unused-value",
+ "-Wno-unused-function",
+ "-Wno-unknown-pragmas",
+ "-Wno-sometimes-uninitialized",
+ }
+
+ local version = str_to_version(_OPTIONS["gcc_version"])
+ if (_OPTIONS["gcc"]~=nil) and string.find(_OPTIONS["gcc"], "clang") then
+ buildoptions_c {
+ "-Wno-unknown-warning-option",
+ "-Wno-absolute-value",
+ "-Wno-unused-variable",
+ }
+ end
+
+ configuration { "vs*" }
+ buildoptions {
+ "/wd4204", -- warning C4204: nonstandard extension used : non-constant aggregate initializer
+ "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used
+ }
+
+ configuration { }
+
+ includedirs {
+ MAME_DIR .. "3rdparty/portaudio/include",
+ MAME_DIR .. "3rdparty/portaudio/src/common",
+ }
+
+ files {
+ MAME_DIR .. "3rdparty/portaudio/src/common/pa_allocation.c",
+ MAME_DIR .. "3rdparty/portaudio/src/common/pa_converters.c",
+ MAME_DIR .. "3rdparty/portaudio/src/common/pa_cpuload.c",
+ MAME_DIR .. "3rdparty/portaudio/src/common/pa_dither.c",
+ MAME_DIR .. "3rdparty/portaudio/src/common/pa_debugprint.c",
+ MAME_DIR .. "3rdparty/portaudio/src/common/pa_front.c",
+ MAME_DIR .. "3rdparty/portaudio/src/common/pa_process.c",
+ MAME_DIR .. "3rdparty/portaudio/src/common/pa_stream.c",
+ MAME_DIR .. "3rdparty/portaudio/src/common/pa_trace.c",
+ MAME_DIR .. "3rdparty/portaudio/src/hostapi/skeleton/pa_hostapi_skeleton.c",
+ }
+
+ if _OPTIONS["targetos"]=="windows" then
+ defines {
+ "PA_USE_DS=1",
+ "PA_USE_WDMKS=1",
+ "PA_USE_WMME=1",
+ }
+ includedirs {
+ MAME_DIR .. "3rdparty/portaudio/src/os/win",
+ }
+
+ configuration { }
+ files {
+ MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_util.c",
+ MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_waveformat.c",
+ MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_hostapis.c",
+ MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_wdmks_utils.c",
+ MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_coinitialize.c",
+ MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds.c",
+ MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c",
+ MAME_DIR .. "3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c",
+ MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c",
+ MAME_DIR .. "3rdparty/portaudio/src/hostapi/wmme/pa_win_wmme.c",
+ }
+
+ end
+ if _OPTIONS["targetos"]=="linux" then
+ defines {
+ "PA_USE_ALSA=1",
+ "PA_USE_OSS=1",
+ "HAVE_LINUX_SOUNDCARD_H",
+ }
+ includedirs {
+ MAME_DIR .. "3rdparty/portaudio/src/os/unix",
+ }
+ files {
+ MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c",
+ MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c",
+ MAME_DIR .. "3rdparty/portaudio/src/hostapi/alsa/pa_linux_alsa.c",
+ MAME_DIR .. "3rdparty/portaudio/src/hostapi/oss/pa_unix_oss.c",
+ }
+ end
+ if _OPTIONS["targetos"]=="macosx" then
+ defines {
+ "PA_USE_COREAUDIO=1",
+ }
+ includedirs {
+ MAME_DIR .. "3rdparty/portaudio/src/os/unix",
+ }
+ files {
+ MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c",
+ MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c",
+ MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core.c",
+ MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c",
+ MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c",
+ MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c",
+ }
+ end
+
+ if (_OPTIONS["SHADOW_CHECK"]=="1") then
+ removebuildoptions {
+ "-Wshadow"
+ }
+ end
+
+--------------------------------------------------
+-- UnitTest++ library objects
+--------------------------------------------------
+
+project "unittest-cpp"
+ uuid "717d39e5-b6ff-4507-a092-c27c05b60ab5"
+ kind "StaticLib"
+
+ files {
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/AssertException.cpp",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/AssertException.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/CheckMacros.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/Checks.cpp",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/Checks.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/CompositeTestReporter.cpp",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/CompositeTestReporter.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/Config.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/CurrentTest.cpp",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/CurrentTest.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/DeferredTestReporter.cpp",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/DeferredTestReporter.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/DeferredTestResult.cpp",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/DeferredTestResult.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/ExceptionMacros.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/ExecuteTest.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/HelperMacros.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/MemoryOutStream.cpp",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/MemoryOutStream.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/ReportAssert.cpp",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/ReportAssert.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/ReportAssertImpl.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/Test.cpp",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/Test.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/TestDetails.cpp",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/TestDetails.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/TestList.cpp",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/TestList.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/TestMacros.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/TestReporter.cpp",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/TestReporter.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/TestReporterStdout.cpp",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/TestReporterStdout.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/TestResults.cpp",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/TestResults.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/TestRunner.cpp",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/TestRunner.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/TestSuite.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/TimeConstraint.cpp",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/TimeConstraint.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/TimeHelpers.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/UnitTest++.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/UnitTestPP.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/XmlTestReporter.cpp",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/XmlTestReporter.h",
+ }
+
+ if _OPTIONS["targetos"]~="windows" then
+ files {
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/Posix/SignalTranslator.cpp",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/Posix/SignalTranslator.h",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/Posix/TimeHelpers.cpp",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/Posix/TimeHelpers.h",
+ }
+ end
+
+ if _OPTIONS["targetos"]=="windows" then
+ files {
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/Win32/TimeHelpers.cpp",
+ MAME_DIR .. "3rdparty/unittest-cpp/UnitTest++/Win32/TimeHelpers.h",
+ }
+ end
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index d499aabbef4..74ee8ac027e 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -2440,11 +2440,29 @@ end
if (BUSES["CGENIE_EXPANSION"]~=null) then
files {
- MAME_DIR .. "src/emu/bus/cgenie/expansion.c",
- MAME_DIR .. "src/emu/bus/cgenie/expansion.h",
- MAME_DIR .. "src/emu/bus/cgenie/carts.c",
- MAME_DIR .. "src/emu/bus/cgenie/carts.h",
- MAME_DIR .. "src/emu/bus/cgenie/floppy.c",
- MAME_DIR .. "src/emu/bus/cgenie/floppy.h",
+ MAME_DIR .. "src/emu/bus/cgenie/expansion/expansion.c",
+ MAME_DIR .. "src/emu/bus/cgenie/expansion/expansion.h",
+ MAME_DIR .. "src/emu/bus/cgenie/expansion/carts.c",
+ MAME_DIR .. "src/emu/bus/cgenie/expansion/carts.h",
+ MAME_DIR .. "src/emu/bus/cgenie/expansion/floppy.c",
+ MAME_DIR .. "src/emu/bus/cgenie/expansion/floppy.h",
+ }
+end
+
+---------------------------------------------------
+--
+--@src/emu/bus/cgenie/parallel.h,BUSES += CGENIE_PARALLEL
+---------------------------------------------------
+
+if (BUSES["CGENIE_PARALLEL"]~=null) then
+ files {
+ MAME_DIR .. "src/emu/bus/cgenie/parallel/parallel.c",
+ MAME_DIR .. "src/emu/bus/cgenie/parallel/parallel.h",
+ MAME_DIR .. "src/emu/bus/cgenie/parallel/carts.c",
+ MAME_DIR .. "src/emu/bus/cgenie/parallel/carts.h",
+ MAME_DIR .. "src/emu/bus/cgenie/parallel/joystick.c",
+ MAME_DIR .. "src/emu/bus/cgenie/parallel/joystick.h",
+ MAME_DIR .. "src/emu/bus/cgenie/parallel/printer.c",
+ MAME_DIR .. "src/emu/bus/cgenie/parallel/printer.h",
}
end
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua
index d4738644375..166ab4beddb 100644
--- a/scripts/src/lib.lua
+++ b/scripts/src/lib.lua
@@ -158,6 +158,8 @@ project "formats"
MAME_DIR .. "src/lib/formats/atarist_dsk.h",
MAME_DIR .. "src/lib/formats/atom_tap.c",
MAME_DIR .. "src/lib/formats/atom_tap.h",
+ MAME_DIR .. "src/lib/formats/bbc_dsk.c",
+ MAME_DIR .. "src/lib/formats/bbc_dsk.h",
MAME_DIR .. "src/lib/formats/bw2_dsk.c",
MAME_DIR .. "src/lib/formats/bw2_dsk.h",
MAME_DIR .. "src/lib/formats/bw12_dsk.c",
@@ -168,6 +170,8 @@ project "formats"
MAME_DIR .. "src/lib/formats/c4040_dsk.h",
MAME_DIR .. "src/lib/formats/c8280_dsk.c",
MAME_DIR .. "src/lib/formats/c8280_dsk.h",
+ MAME_DIR .. "src/lib/formats/camplynx_cas.c",
+ MAME_DIR .. "src/lib/formats/camplynx_cas.h",
MAME_DIR .. "src/lib/formats/cbm_crt.c",
MAME_DIR .. "src/lib/formats/cbm_crt.h",
MAME_DIR .. "src/lib/formats/cbm_tap.c",
@@ -389,8 +393,6 @@ project "formats"
MAME_DIR .. "src/lib/formats/x1_tap.h",
MAME_DIR .. "src/lib/formats/xdf_dsk.c",
MAME_DIR .. "src/lib/formats/xdf_dsk.h",
- MAME_DIR .. "src/lib/formats/z80ne_dsk.c",
- MAME_DIR .. "src/lib/formats/z80ne_dsk.h",
MAME_DIR .. "src/lib/formats/zx81_p.c",
MAME_DIR .. "src/lib/formats/zx81_p.h",
MAME_DIR .. "src/lib/formats/hxcmfm_dsk.c",
diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index 4324662ffd3..528cebbd3d2 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -2072,6 +2072,18 @@ end
---------------------------------------------------
--
+--@src/emu/machine/tms1024.h,MACHINES += TMS1024
+---------------------------------------------------
+
+if (MACHINES["TMS1024"]~=null) then
+ files {
+ MAME_DIR .. "src/emu/machine/tms1024.c",
+ MAME_DIR .. "src/emu/machine/tms1024.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/emu/machine/tms5501.h,MACHINES += TMS5501
---------------------------------------------------
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 80ac9c8b9c6..9559eb1f594 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -180,7 +180,10 @@ function mainProject(_target, _subtarget)
MAME_DIR .. "src/version.c",
GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.c",
}
-
+ dependency {
+ { "../../../../generated/mame/mame/drivlist.c", MAME_DIR .. "src/mame/mess.lst", true },
+ { "../../../../generated/mame/mame/drivlist.c" , MAME_DIR .. "src/mame/arcade.lst", true},
+ }
custombuildtask {
{ MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.c", { MAME_DIR .. "src/build/makelist.py" }, {"@echo Building driver list...", PYTHON .. " $(1) $(<) > $(@)" }},
}
diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua
index 6c79eb1b463..9d61b0d4892 100644
--- a/scripts/src/netlist.lua
+++ b/scripts/src/netlist.lua
@@ -7,7 +7,6 @@ files {
MAME_DIR .. "src/emu/netlist/nl_lists.h",
MAME_DIR .. "src/emu/netlist/nl_time.h",
MAME_DIR .. "src/emu/netlist/nl_util.h",
- MAME_DIR .. "src/emu/netlist/plists.h",
MAME_DIR .. "src/emu/netlist/nl_base.c",
MAME_DIR .. "src/emu/netlist/nl_base.h",
MAME_DIR .. "src/emu/netlist/nl_parser.c",
@@ -16,10 +15,17 @@ files {
MAME_DIR .. "src/emu/netlist/nl_setup.h",
MAME_DIR .. "src/emu/netlist/nl_factory.c",
MAME_DIR .. "src/emu/netlist/nl_factory.h",
- MAME_DIR .. "src/emu/netlist/pstring.c",
- MAME_DIR .. "src/emu/netlist/pstring.h",
- MAME_DIR .. "src/emu/netlist/pstate.c",
- MAME_DIR .. "src/emu/netlist/pstate.h",
+ MAME_DIR .. "src/emu/netlist/plib/pconfig.h",
+ MAME_DIR .. "src/emu/netlist/plib/palloc.c",
+ MAME_DIR .. "src/emu/netlist/plib/palloc.h",
+ MAME_DIR .. "src/emu/netlist/plib/plists.h",
+ MAME_DIR .. "src/emu/netlist/plib/poptions.h",
+ MAME_DIR .. "src/emu/netlist/plib/pparser.c",
+ MAME_DIR .. "src/emu/netlist/plib/pparser.h",
+ MAME_DIR .. "src/emu/netlist/plib/pstate.c",
+ MAME_DIR .. "src/emu/netlist/plib/pstate.h",
+ MAME_DIR .. "src/emu/netlist/plib/pstring.c",
+ MAME_DIR .. "src/emu/netlist/plib/pstring.h",
MAME_DIR .. "src/emu/netlist/analog/nld_bjt.c",
MAME_DIR .. "src/emu/netlist/analog/nld_bjt.h",
MAME_DIR .. "src/emu/netlist/analog/nld_fourterm.c",
diff --git a/scripts/src/tests.lua b/scripts/src/tests.lua
new file mode 100644
index 00000000000..1423c10222f
--- /dev/null
+++ b/scripts/src/tests.lua
@@ -0,0 +1,42 @@
+-- license:BSD-3-Clause
+-- copyright-holders:MAMEdev Team
+
+--------------------------------------------------
+-- MAME tests
+--------------------------------------------------
+
+project("tests")
+uuid ("66d4c639-196b-4065-a411-7ee9266564f5")
+kind "ConsoleApp"
+
+options {
+ "ForceCPP",
+}
+
+flags {
+ "Symbols", -- always include minimum symbols for executables
+}
+
+if _OPTIONS["SEPARATE_BIN"]~="1" then
+ targetdir(MAME_DIR)
+end
+
+links {
+ "unittest-cpp",
+ "utils",
+ "expat",
+ "zlib",
+ "ocore_" .. _OPTIONS["osd"],
+}
+
+includedirs {
+ MAME_DIR .. "3rdparty/unittest-cpp",
+ MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/lib/util",
+}
+
+files {
+ MAME_DIR .. "tests/main.c",
+ MAME_DIR .. "tests/lib/util/corestr.c",
+}
+
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index 0c1cbc3075e..936afb54346 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -448,7 +448,7 @@ links {
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
- MAME_DIR .. "src/emu",
+ MAME_DIR .. "src/emu/netlist",
}
files {