summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
author Ariane Fugmann <sailorsat@t-online.de>2015-09-06 20:56:34 +0200
committer Ariane Fugmann <sailorsat@t-online.de>2015-09-06 20:56:34 +0200
commit27f64fa96753d29d4ecb844830ae7e609eb1d2de (patch)
tree5ccd2d9ef247acc2f3770e9a9d371d03ae638ce7 /scripts/src
parent64b3be3720067b756a3484e720601fa03b4de4fe (diff)
parent22e4802e1054d733f3de282b00ea594e998d62e3 (diff)
Merge pull request #5 from mamedev/master
sync with master
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/3rdparty.lua98
-rw-r--r--scripts/src/bus.lua53
-rw-r--r--scripts/src/cpu.lua42
-rw-r--r--scripts/src/emu.lua30
-rw-r--r--scripts/src/lib.lua4
-rw-r--r--scripts/src/machine.lua52
-rw-r--r--scripts/src/main.lua4
-rw-r--r--scripts/src/netlist.lua10
-rw-r--r--scripts/src/osd/sdl_cfg.lua3
-rw-r--r--scripts/src/osd/windows.lua3
-rw-r--r--scripts/src/tests.lua11
-rw-r--r--scripts/src/tools.lua38
12 files changed, 245 insertions, 103 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index c2808c55dc5..6f8a1f2b323 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -534,6 +534,13 @@ project "portmidi"
MAME_DIR .. "3rdparty/portmidi/porttime/ptlinux.c",
}
end
+ if _OPTIONS["targetos"]=="netbsd" then
+ files {
+ MAME_DIR .. "3rdparty/portmidi/pm_linux/pmlinux.c",
+ MAME_DIR .. "3rdparty/portmidi/pm_linux/finddefault.c",
+ MAME_DIR .. "3rdparty/portmidi/porttime/ptlinux.c",
+ }
+ end
if _OPTIONS["targetos"]=="macosx" then
files {
MAME_DIR .. "3rdparty/portmidi/pm_mac/pmmac.c",
@@ -591,6 +598,11 @@ project "bgfx"
MAME_DIR .. "3rdparty/bx/include/compat/freebsd",
}
+ configuration { "netbsd" }
+ includedirs {
+ MAME_DIR .. "3rdparty/bx/include/compat/freebsd",
+ }
+
configuration { "gmake" }
buildoptions {
"-Wno-uninitialized",
@@ -650,6 +662,7 @@ end
-- PortAudio library objects
--------------------------------------------------
+if _OPTIONS["with-bundled-portaudio"] then
project "portaudio"
uuid "0755c5f5-eccf-47f3-98a9-df67018a94d4"
kind "StaticLib"
@@ -775,75 +788,32 @@ project "portaudio"
"-Wshadow"
}
end
+else
+links {
+ "portaudio",
+}
+end
--------------------------------------------------
--- UnitTest++ library objects
+-- GoogleTest library objects
--------------------------------------------------
-project "unittest-cpp"
- uuid "717d39e5-b6ff-4507-a092-c27c05b60ab5"
+project "gtest"
+ uuid "fa306a8d-fb10-4d4a-9d2e-fdb9076407b4"
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",
+ configuration { "gmake" }
+ buildoptions {
+ "-Wno-undef",
+ "-Wno-unused-variable",
}
- 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
+ configuration { }
+
+ includedirs {
+ MAME_DIR .. "3rdparty/googletest/googletest/include",
+ MAME_DIR .. "3rdparty/googletest/googletest",
+ }
+ files {
+ MAME_DIR .. "3rdparty/googletest/googletest/src/gtest-all.cc",
+ }
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index 8638af2e780..1e8ab15f304 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -240,6 +240,8 @@ if (BUSES["C64"]~=null) then
MAME_DIR .. "src/emu/bus/c64/exp.h",
MAME_DIR .. "src/emu/bus/c64/c128_comal80.c",
MAME_DIR .. "src/emu/bus/c64/c128_comal80.h",
+ MAME_DIR .. "src/emu/bus/c64/c128_partner.c",
+ MAME_DIR .. "src/emu/bus/c64/c128_partner.h",
MAME_DIR .. "src/emu/bus/c64/comal80.c",
MAME_DIR .. "src/emu/bus/c64/comal80.h",
MAME_DIR .. "src/emu/bus/c64/cpm.c",
@@ -431,6 +433,12 @@ if (BUSES["CBMIEC"]~=null) then
MAME_DIR .. "src/emu/bus/cbmiec/interpod.h",
MAME_DIR .. "src/emu/bus/cbmiec/serialbox.c",
MAME_DIR .. "src/emu/bus/cbmiec/serialbox.h",
+ MAME_DIR .. "src/emu/bus/cbmiec/vic1515.c",
+ MAME_DIR .. "src/emu/bus/cbmiec/vic1515.h",
+ MAME_DIR .. "src/emu/bus/cbmiec/vic1520.c",
+ MAME_DIR .. "src/emu/bus/cbmiec/vic1520.h",
+ MAME_DIR .. "src/emu/bus/cbmiec/c1526.c",
+ MAME_DIR .. "src/emu/bus/cbmiec/c1526.h",
}
end
@@ -496,6 +504,8 @@ if (BUSES["COLECO"]~=null) then
MAME_DIR .. "src/emu/bus/coleco/exp.h",
MAME_DIR .. "src/emu/bus/coleco/std.c",
MAME_DIR .. "src/emu/bus/coleco/std.h",
+ MAME_DIR .. "src/emu/bus/coleco/xin1.h",
+ MAME_DIR .. "src/emu/bus/coleco/xin1.c",
}
end
@@ -878,6 +888,8 @@ if (BUSES["MSX_SLOT"]~=null) then
MAME_DIR .. "src/emu/bus/msx_cart/dooly.h",
MAME_DIR .. "src/emu/bus/msx_cart/fmpac.c",
MAME_DIR .. "src/emu/bus/msx_cart/fmpac.h",
+ MAME_DIR .. "src/emu/bus/msx_cart/fs_sr022.c",
+ MAME_DIR .. "src/emu/bus/msx_cart/fs_sr022.h",
MAME_DIR .. "src/emu/bus/msx_cart/halnote.c",
MAME_DIR .. "src/emu/bus/msx_cart/halnote.h",
MAME_DIR .. "src/emu/bus/msx_cart/hfox.c",
@@ -890,6 +902,8 @@ if (BUSES["MSX_SLOT"]~=null) then
MAME_DIR .. "src/emu/bus/msx_cart/korean.h",
MAME_DIR .. "src/emu/bus/msx_cart/majutsushi.c",
MAME_DIR .. "src/emu/bus/msx_cart/majutsushi.h",
+ MAME_DIR .. "src/emu/bus/msx_cart/moonsound.h",
+ MAME_DIR .. "src/emu/bus/msx_cart/moonsound.c",
MAME_DIR .. "src/emu/bus/msx_cart/msx_audio.c",
MAME_DIR .. "src/emu/bus/msx_cart/msx_audio.h",
MAME_DIR .. "src/emu/bus/msx_cart/msx_audio_kb.c",
@@ -1494,7 +1508,7 @@ if (BUSES["CENTRONICS"]~=null) then
MAME_DIR .. "src/emu/bus/centronics/digiblst.c",
MAME_DIR .. "src/emu/bus/centronics/digiblst.h",
}
-
+
dependency {
{ MAME_DIR .. "src/emu/bus/centronics/epson_ex800.c", GEN_DIR .. "emu/layout/ex800.lh" },
{ MAME_DIR .. "src/emu/bus/centronics/epson_lx800.c", GEN_DIR .. "emu/layout/lx800.lh" },
@@ -1504,7 +1518,7 @@ if (BUSES["CENTRONICS"]~=null) then
custombuildtask {
layoutbuildtask("emu/layout", "ex800"),
layoutbuildtask("emu/layout", "lx800"),
- }
+ }
end
---------------------------------------------------
@@ -1980,6 +1994,41 @@ end
---------------------------------------------------
--
+--@src/emu/bus/ti99x/990_dk.h,BUSES["TI99X"] = true
+---------------------------------------------------
+
+if (BUSES["TI99X"]~=null) then
+ files {
+ MAME_DIR .. "src/emu/bus/ti99x/990_dk.c",
+ MAME_DIR .. "src/emu/bus/ti99x/990_dk.h",
+ MAME_DIR .. "src/emu/bus/ti99x/990_hd.c",
+ MAME_DIR .. "src/emu/bus/ti99x/990_hd.h",
+ MAME_DIR .. "src/emu/bus/ti99x/990_tap.c",
+ MAME_DIR .. "src/emu/bus/ti99x/990_tap.h",
+ MAME_DIR .. "src/emu/bus/ti99x/998board.c",
+ MAME_DIR .. "src/emu/bus/ti99x/998board.h",
+ MAME_DIR .. "src/emu/bus/ti99x/datamux.c",
+ MAME_DIR .. "src/emu/bus/ti99x/datamux.h",
+ MAME_DIR .. "src/emu/bus/ti99x/genboard.c",
+ MAME_DIR .. "src/emu/bus/ti99x/genboard.h",
+ MAME_DIR .. "src/emu/bus/ti99x/grom.c",
+ MAME_DIR .. "src/emu/bus/ti99x/grom.h",
+ MAME_DIR .. "src/emu/bus/ti99x/gromport.c",
+ MAME_DIR .. "src/emu/bus/ti99x/gromport.h",
+ MAME_DIR .. "src/emu/bus/ti99x/handset.c",
+ MAME_DIR .. "src/emu/bus/ti99x/handset.h",
+ MAME_DIR .. "src/emu/bus/ti99x/joyport.c",
+ MAME_DIR .. "src/emu/bus/ti99x/joyport.h",
+ MAME_DIR .. "src/emu/bus/ti99x/mecmouse.c",
+ MAME_DIR .. "src/emu/bus/ti99x/mecmouse.h",
+ MAME_DIR .. "src/emu/bus/ti99x/ti99defs.h",
+ MAME_DIR .. "src/emu/bus/ti99x/videowrp.c",
+ MAME_DIR .. "src/emu/bus/ti99x/videowrp.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/emu/bus/ti99_peb/peribox.h,BUSES["TI99PEB"] = true
---------------------------------------------------
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index ddbcfb768ab..23cbfc8ff52 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -461,6 +461,22 @@ if (CPUS["T11"]~=null or _OPTIONS["with-tools"]) then
end
--------------------------------------------------
+-- DEC PDP-8
+--@src/emu/cpu/pdp8/pdp8.h,CPUS["PDP8"] = true
+--------------------------------------------------
+
+if (CPUS["PDP8"]~=null) then
+ files {
+ MAME_DIR .. "src/emu/cpu/pdp8/pdp8.c",
+ MAME_DIR .. "src/emu/cpu/pdp8/pdp8.h",
+ }
+end
+
+if (CPUS["PDP8"]~=null or _OPTIONS["with-tools"]) then
+ table.insert(disasm_files , MAME_DIR .. "src/emu/cpu/pdp8/pdp8dasm.c")
+end
+
+--------------------------------------------------
-- F8
--@src/emu/cpu/f8/f8.h,CPUS["F8"] = true
--------------------------------------------------
@@ -1510,6 +1526,32 @@ if (CPUS["RSP"]~=null) then
MAME_DIR .. "src/emu/cpu/rsp/rspcp2.h",
MAME_DIR .. "src/emu/cpu/rsp/rspcp2d.c",
MAME_DIR .. "src/emu/cpu/rsp/rspcp2d.h",
+ MAME_DIR .. "src/emu/cpu/rsp/clamp.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vabs.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vadd.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vaddc.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vand.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vch.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vcl.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vcmp.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vcr.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vdivh.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vldst.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vmac.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vmov.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vmrg.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vmudh.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vmul.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vmulh.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vmull.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vmulm.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vmuln.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vor.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vrcpsq.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vrsq.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vsub.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vsubc.h",
+ MAME_DIR .. "src/emu/cpu/rsp/vxor.h",
}
end
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua
index 26c5f9edd28..49072ed0239 100644
--- a/scripts/src/emu.lua
+++ b/scripts/src/emu.lua
@@ -144,7 +144,7 @@ files {
MAME_DIR .. "src/emu/output.c",
MAME_DIR .. "src/emu/output.h",
MAME_DIR .. "src/emu/render.c",
- MAME_DIR .. "src/emu/render.h",
+ MAME_DIR .. "src/emu/render.h",
MAME_DIR .. "src/emu/rendfont.c",
MAME_DIR .. "src/emu/rendfont.h",
MAME_DIR .. "src/emu/rendlay.c",
@@ -216,7 +216,7 @@ files {
MAME_DIR .. "src/emu/validity.h",
MAME_DIR .. "src/emu/video.c",
MAME_DIR .. "src/emu/video.h",
- MAME_DIR .. "src/emu/rendersw.inc",
+ MAME_DIR .. "src/emu/rendersw.inc",
MAME_DIR .. "src/emu/debug/debugcmd.c",
MAME_DIR .. "src/emu/debug/debugcmd.h",
MAME_DIR .. "src/emu/debug/debugcon.c",
@@ -296,6 +296,8 @@ files {
MAME_DIR .. "src/emu/imagedev/floppy.h",
MAME_DIR .. "src/emu/imagedev/harddriv.c",
MAME_DIR .. "src/emu/imagedev/harddriv.h",
+ MAME_DIR .. "src/emu/imagedev/mfmhd.c",
+ MAME_DIR .. "src/emu/imagedev/mfmhd.h",
MAME_DIR .. "src/emu/imagedev/midiin.c",
MAME_DIR .. "src/emu/imagedev/midiin.h",
MAME_DIR .. "src/emu/imagedev/midiout.c",
@@ -340,12 +342,12 @@ dependency {
{ MAME_DIR .. "src/emu/rendlay.c", GEN_DIR .. "emu/layout/noscreens.lh" },
{ MAME_DIR .. "src/emu/video.c", GEN_DIR .. "emu/layout/snap.lh" },
-
+
}
custombuildtask {
{ MAME_DIR .. "src/emu/uismall.png" , GEN_DIR .. "emu/uismall.fh", { MAME_DIR.. "src/build/png2bdc.py", MAME_DIR .. "src/build/file2str.py" }, {"@echo Converting uismall.png...", PYTHON .. " $(1) $(<) temp.bdc", PYTHON .. " $(2) temp.bdc $(@) font_uismall UINT8" }},
-
+
layoutbuildtask("emu/layout", "dualhovu"),
layoutbuildtask("emu/layout", "dualhsxs"),
layoutbuildtask("emu/layout", "dualhuov"),
@@ -377,6 +379,7 @@ function emuProject(_target, _subtarget)
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
+ MAME_DIR .. "src/emu/netlist",
MAME_DIR .. "src/mame", -- used for sound amiga
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
@@ -400,17 +403,17 @@ function emuProject(_target, _subtarget)
MAME_DIR .. "3rdparty/lua/src",
}
end
-
+
dofile(path.join("src", "cpu.lua"))
dofile(path.join("src", "sound.lua"))
-
-
+
+
dofile(path.join("src", "video.lua"))
dofile(path.join("src", "machine.lua"))
-if (_OPTIONS["DRIVERS"] == nil) then
+if (_OPTIONS["DRIVERS"] == nil) then
project ("bus")
uuid ("5d782c89-cf7e-4cfe-8f9f-0d4bfc16c91d")
kind (LIBTYPE)
@@ -423,6 +426,7 @@ if (_OPTIONS["DRIVERS"] == nil) then
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
+ MAME_DIR .. "src/emu/netlist",
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
@@ -451,11 +455,11 @@ if (_OPTIONS["DRIVERS"] == nil) then
else
dofile(path.join("src", "bus.lua"))
end
-
- -- netlist now defines a project
+
+ -- netlist now defines a project
dofile(path.join("src", "netlist.lua"))
-
+
project ("dasm")
uuid ("f2d28b0a-6da5-4f78-b629-d834aa00429d")
kind (LIBTYPE)
@@ -487,10 +491,10 @@ end
MAME_DIR .. "3rdparty/lua/src",
}
end
-
+
files {
disasm_files
- }
+ }
if #disasm_dependency > 0 then
dependency {
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua
index f5a54f0dd68..7d21cf3e5a2 100644
--- a/scripts/src/lib.lua
+++ b/scripts/src/lib.lua
@@ -258,6 +258,8 @@ project "formats"
MAME_DIR .. "src/lib/formats/g64_dsk.h",
MAME_DIR .. "src/lib/formats/gtp_cas.c",
MAME_DIR .. "src/lib/formats/gtp_cas.h",
+ MAME_DIR .. "src/lib/formats/guab_dsk.c",
+ MAME_DIR .. "src/lib/formats/guab_dsk.h",
MAME_DIR .. "src/lib/formats/hect_dsk.c",
MAME_DIR .. "src/lib/formats/hect_dsk.h",
MAME_DIR .. "src/lib/formats/hect_tap.c",
@@ -294,6 +296,8 @@ project "formats"
MAME_DIR .. "src/lib/formats/msx_dsk.h",
MAME_DIR .. "src/lib/formats/mfi_dsk.c",
MAME_DIR .. "src/lib/formats/mfi_dsk.h",
+ MAME_DIR .. "src/lib/formats/mfm_hd.c",
+ MAME_DIR .. "src/lib/formats/mfm_hd.h",
MAME_DIR .. "src/lib/formats/mz_cas.c",
MAME_DIR .. "src/lib/formats/mz_cas.h",
MAME_DIR .. "src/lib/formats/nanos_dsk.c",
diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index cc729cd11bc..4731fef6880 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -188,7 +188,19 @@ end
---------------------------------------------------
--
---@src/emu/machine/68561mpcc.h,MACHINES["68561MPCC"] = true
+--@src/emu/machine/68230pit.h,MACHINES["PIT68230"] = true
+---------------------------------------------------
+
+if (MACHINES["PIT68230"]~=null) then
+ files {
+ MAME_DIR .. "src/emu/machine/68230pit.c",
+ MAME_DIR .. "src/emu/machine/68230pit.h",
+ }
+end
+
+---------------------------------------------------
+--
+--@src/emu/machine/68561mpcc.h,MACHINES += 68561MPCC
---------------------------------------------------
if (MACHINES["68561MPCC"]~=null) then
@@ -441,13 +453,13 @@ end
---------------------------------------------------
--
---@src/emu/machine/at29040a.h,MACHINES["AT29040"] = true
+--@src/emu/machine/at29x.h,MACHINES["AT29X"] = true
---------------------------------------------------
-if (MACHINES["AT29040"]~=null) then
+if (MACHINES["AT29X"]~=null) then
files {
- MAME_DIR .. "src/emu/machine/at29040a.c",
- MAME_DIR .. "src/emu/machine/at29040a.h",
+ MAME_DIR .. "src/emu/machine/at29x.c",
+ MAME_DIR .. "src/emu/machine/at29x.h",
}
end
@@ -2538,25 +2550,13 @@ end
---------------------------------------------------
--
---@src/emu/machine/hdc9234.h,MACHINES["HDC9234"] = true
+--@src/emu/machine/hdc92x4.h,MACHINES["HDC9234"] = true
---------------------------------------------------
if (MACHINES["HDC9234"]~=null) then
files {
- MAME_DIR .. "src/emu/machine/hdc9234.c",
- MAME_DIR .. "src/emu/machine/hdc9234.h",
- }
-end
-
----------------------------------------------------
---
---@src/emu/machine/ti99_hd.h,MACHINES["TI99_HD"] = true
----------------------------------------------------
-
-if (MACHINES["TI99_HD"]~=null) then
- files {
- MAME_DIR .. "src/emu/machine/ti99_hd.c",
- MAME_DIR .. "src/emu/machine/ti99_hd.h",
+ MAME_DIR .. "src/emu/machine/hdc92x4.c",
+ MAME_DIR .. "src/emu/machine/hdc92x4.h",
}
end
@@ -2652,3 +2652,15 @@ if (MACHINES["NETLIST"]~=null) then
MAME_DIR .. "src/emu/machine/netlist.h",
}
end
+
+---------------------------------------------------
+--
+--@src/emu/machine/nsc810.h,MACHINES["NSC810"] = true
+---------------------------------------------------
+
+if (MACHINES["NSC810"]~=null) then
+ files {
+ MAME_DIR .. "src/emu/machine/nsc810.c",
+ MAME_DIR .. "src/emu/machine/nsc810.h",
+ }
+end
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 25cc1a32ca7..6baad44c566 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -234,12 +234,14 @@ if (_OPTIONS["DRIVERS"] == nil) then
{ MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.c", { MAME_DIR .. "src/build/makelist.py" }, {"@echo Building driver list...", PYTHON .. " $(1) $(<) > $(@)" }},
}
end
+
+if _OPTIONS["FORCE_VERSION_COMPILE"]=="1" then
configuration { "gmake" }
dependency {
{ ".PHONY", ".FORCE", true },
{ "$(OBJDIR)/src/version.o", ".FORCE", true },
}
-
+end
configuration { "mingw*" }
custombuildtask {
{ MAME_DIR .. "src/version.c" , GEN_DIR .. "/resource/" .. rctarget .. "vers.rc", { MAME_DIR .. "src/build/verinfo.py" }, {"@echo Emitting " .. rctarget .. "vers.rc" .. "...", PYTHON .. " $(1) -r -b " .. rctarget .. " $(<) > $(@)" }},
diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua
index b45ed49d27b..18f0f074d3b 100644
--- a/scripts/src/netlist.lua
+++ b/scripts/src/netlist.lua
@@ -48,6 +48,8 @@ project "netlist"
MAME_DIR .. "src/emu/netlist/plib/pstring.h",
MAME_DIR .. "src/emu/netlist/plib/pstring.c",
MAME_DIR .. "src/emu/netlist/plib/pstring.h",
+ MAME_DIR .. "src/emu/netlist/plib/pstream.c",
+ MAME_DIR .. "src/emu/netlist/plib/pstream.h",
MAME_DIR .. "src/emu/netlist/tools/nl_convert.c",
MAME_DIR .. "src/emu/netlist/tools/nl_convert.h",
MAME_DIR .. "src/emu/netlist/analog/nld_bjt.c",
@@ -152,4 +154,12 @@ project "netlist"
MAME_DIR .. "src/emu/netlist/devices/nld_signal.h",
MAME_DIR .. "src/emu/netlist/devices/nld_truthtable.c",
MAME_DIR .. "src/emu/netlist/devices/nld_truthtable.h",
+ MAME_DIR .. "src/emu/netlist/macro/nlm_ttl74xx.c",
+ MAME_DIR .. "src/emu/netlist/macro/nlm_ttl74xx.h",
+ MAME_DIR .. "src/emu/netlist/macro/nlm_cd4xxx.c",
+ MAME_DIR .. "src/emu/netlist/macro/nlm_cd4xxx.h",
+ MAME_DIR .. "src/emu/netlist/macro/nlm_opamp.c",
+ MAME_DIR .. "src/emu/netlist/macro/nlm_opamp.h",
+ MAME_DIR .. "src/emu/netlist/macro/nlm_other.c",
+ MAME_DIR .. "src/emu/netlist/macro/nlm_other.h",
}
diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua
index a204201d6f5..878a5a2f945 100644
--- a/scripts/src/osd/sdl_cfg.lua
+++ b/scripts/src/osd/sdl_cfg.lua
@@ -144,6 +144,9 @@ elseif _OPTIONS["targetos"]=="freebsd" then
"-isystem /usr/local/include",
}
elseif _OPTIONS["targetos"]=="os2" then
+ defines {
+ "SDLMAME_OS2",
+ }
buildoptions {
backtick(sdlconfigcmd() .. " --cflags"),
}
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index e9965017933..b793b83433d 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -11,6 +11,9 @@ function maintargetosdoptions(_target,_subtarget)
linkoptions {
"-municode",
}
+ links {
+ "mingw32",
+ }
configuration { }
diff --git a/scripts/src/tests.lua b/scripts/src/tests.lua
index 1423c10222f..2b6eb397848 100644
--- a/scripts/src/tests.lua
+++ b/scripts/src/tests.lua
@@ -21,8 +21,15 @@ if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
+configuration { "gmake" }
+ buildoptions {
+ "-Wno-undef",
+ }
+
+configuration { }
+
links {
- "unittest-cpp",
+ "gtest",
"utils",
"expat",
"zlib",
@@ -30,7 +37,7 @@ links {
}
includedirs {
- MAME_DIR .. "3rdparty/unittest-cpp",
+ MAME_DIR .. "3rdparty/googletest/googletest/include",
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
}
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index 55f966eed2e..1df4fe55b31 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -615,7 +615,43 @@ includedirs {
}
files {
- MAME_DIR .. "src/tools/nltool.c",
+ MAME_DIR .. "src/emu/netlist/prg/nltool.c",
+}
+
+--------------------------------------------------
+-- nlwav
+--------------------------------------------------
+
+project("nlwav")
+uuid ("7c5396d1-2a1a-4c93-bed6-6b8fa182054a")
+kind "ConsoleApp"
+
+options {
+ "ForceCPP",
+}
+
+flags {
+ "Symbols", -- always include minimum symbols for executables
+}
+
+if _OPTIONS["SEPARATE_BIN"]~="1" then
+ targetdir(MAME_DIR)
+end
+
+links {
+ "utils",
+ "ocore_" .. _OPTIONS["osd"],
+ "netlist",
+}
+
+includedirs {
+ MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/lib/util",
+ MAME_DIR .. "src/emu/netlist",
+}
+
+files {
+ MAME_DIR .. "src/emu/netlist/prg/nlwav.c",
}
--------------------------------------------------