diff options
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/3rdparty.lua | 245 | ||||
-rw-r--r-- | scripts/src/bus.lua | 17 | ||||
-rw-r--r-- | scripts/src/emu.lua | 62 | ||||
-rw-r--r-- | scripts/src/lib.lua | 49 | ||||
-rw-r--r-- | scripts/src/machine.lua | 23 | ||||
-rw-r--r-- | scripts/src/main.lua | 42 | ||||
-rw-r--r-- | scripts/src/netlist.lua | 270 | ||||
-rw-r--r-- | scripts/src/osd/osdmini.lua | 4 | ||||
-rw-r--r-- | scripts/src/osd/sdl.lua | 11 | ||||
-rw-r--r-- | scripts/src/osd/sdl_cfg.lua | 5 | ||||
-rw-r--r-- | scripts/src/osd/windows.lua | 4 | ||||
-rw-r--r-- | scripts/src/tests.lua | 42 | ||||
-rw-r--r-- | scripts/src/tools.lua | 273 |
13 files changed, 844 insertions, 203 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index aac32bfad74..c2808c55dc5 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -34,6 +34,7 @@ end -- zlib library objects -------------------------------------------------- +if _OPTIONS["with-bundled-zlib"] then project "zlib" uuid "3d78bd2a-2bd0-4449-8087-42ddfaef7ec9" kind "StaticLib" @@ -71,6 +72,11 @@ project "zlib" "-Wshadow" } end +else +links { + "z", +} +end -------------------------------------------------- -- SoftFloat library objects @@ -112,6 +118,7 @@ project "softfloat" -- libJPEG library objects -------------------------------------------------- +if _OPTIONS["with-bundled-jpeg"] then project "jpeg" uuid "447c6800-dcfd-4c48-b72a-a8223bb409ca" kind "StaticLib" @@ -169,11 +176,17 @@ project "jpeg" "-Wshadow" } end +else +links { + "jpeg", +} +end -------------------------------------------------- -- libflac library objects -------------------------------------------------- +if _OPTIONS["with-bundled-flac"] then project "flac" uuid "b6fc19e8-073a-4541-bb7b-d24b548d424a" kind "StaticLib" @@ -223,6 +236,11 @@ project "flac" "-Wshadow" } end +else +links { + "FLAC", +} +end -------------------------------------------------- -- lib7z library objects @@ -268,6 +286,7 @@ project "7z" -- LUA library objects -------------------------------------------------- +if _OPTIONS["with-bundled-lua"] then project "lua" uuid "d9e2eed1-f1ab-4737-a6ac-863700b1a5a9" kind "StaticLib" @@ -342,6 +361,11 @@ project "lua" "-Wshadow" } end +else +links { + "lua", +} +end -------------------------------------------------- -- sqlite3 lua library objects @@ -362,8 +386,12 @@ project "lsqlite3" includedirs { MAME_DIR .. "3rdparty", - MAME_DIR .. "3rdparty/lua/src", } + if _OPTIONS["with-bundled-lua"] then + includedirs { + MAME_DIR .. "3rdparty/lua/src", + } + end files { MAME_DIR .. "3rdparty/lsqlite3/lsqlite3.c", @@ -435,6 +463,7 @@ project "jsoncpp" -- SQLite3 library objects -------------------------------------------------- +if _OPTIONS["with-bundled-sqlite3"] then project "sqllite3" uuid "5cb3d495-57ed-461c-81e5-80dc0857517d" kind "StaticLib" @@ -455,11 +484,17 @@ project "sqllite3" "-Wshadow" } end +else +links { + "sqlite3", +} +end -------------------------------------------------- -- portmidi library objects -------------------------------------------------- if _OPTIONS["NO_USE_MIDI"]~="1" then +if _OPTIONS["with-bundled-portmidi"] then project "portmidi" uuid "587f2da6-3274-4a65-86a2-f13ea315bb98" kind "StaticLib" @@ -514,6 +549,11 @@ project "portmidi" "-Wshadow" } end +else +links { + "portmidi", +} +end end -------------------------------------------------- -- BGFX library objects @@ -554,6 +594,7 @@ project "bgfx" configuration { "gmake" } buildoptions { "-Wno-uninitialized", + "-Wno-unused-function", } configuration { } @@ -604,3 +645,205 @@ 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-variable", + "-Wno-unused-value", + "-Wno-unused-function", + "-Wno-unknown-pragmas", + } + + local version = str_to_version(_OPTIONS["gcc_version"]) + if (_OPTIONS["gcc"]~=nil) then + if string.find(_OPTIONS["gcc"], "clang") then + buildoptions_c { + "-Wno-unknown-warning-option", + "-Wno-absolute-value", + "-Wno-unused-but-set-variable", + "-Wno-maybe-uninitialized", + "-Wno-sometimes-uninitialized", + } + else + if (version >= 40600) then + buildoptions_c { + "-Wno-unused-but-set-variable", + "-Wno-maybe-uninitialized", + "-Wno-sometimes-uninitialized", + } + end + end + 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 74ee8ac027e..10b6a0f0d52 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -164,6 +164,23 @@ end --------------------------------------------------- -- +--@src/emu/bus/apricot/expansion.h,BUSES += APRICOT_EXPANSION +--------------------------------------------------- + +if (BUSES["APRICOT_EXPANSION"]~=null) then + files { + MAME_DIR .. "src/emu/bus/apricot/expansion.c", + MAME_DIR .. "src/emu/bus/apricot/expansion.h", + MAME_DIR .. "src/emu/bus/apricot/cards.c", + MAME_DIR .. "src/emu/bus/apricot/cards.h", + MAME_DIR .. "src/emu/bus/apricot/ram.c", + MAME_DIR .. "src/emu/bus/apricot/ram.h", + } +end + + +--------------------------------------------------- +-- --@src/emu/bus/arcadia/slot.h,BUSES += ARCADIA --------------------------------------------------- diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index 3b020839b14..2cd14d3cac4 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -2,8 +2,9 @@ -- copyright-holders:MAMEdev Team project ("emu") +targetsubdir(_OPTIONS["target"] .."_" .. _OPTIONS["subtarget"]) uuid ("e6fa15e4-a354-4526-acef-13c8e80fcacf") -kind "StaticLib" +kind (LIBTYPE) options { "ForceCPP", } @@ -14,8 +15,6 @@ includedirs { MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", - MAME_DIR .. "3rdparty/lua/src", - MAME_DIR .. "3rdparty/zlib", GEN_DIR .. "emu", GEN_DIR .. "emu/layout", } @@ -24,6 +23,16 @@ if _OPTIONS["with-bundled-expat"] then MAME_DIR .. "3rdparty/expat/lib", } end +if _OPTIONS["with-bundled-zlib"] then + includedirs { + MAME_DIR .. "3rdparty/zlib", + } +end +if _OPTIONS["with-bundled-lua"] then + includedirs { + MAME_DIR .. "3rdparty/lua/src", + } +end files { MAME_DIR .. "src/emu/emu.h", @@ -265,8 +274,6 @@ files { MAME_DIR .. "src/emu/machine/laserdsc.h", MAME_DIR .. "src/emu/machine/latch.c", MAME_DIR .. "src/emu/machine/latch.h", - MAME_DIR .. "src/emu/machine/netlist.c", - MAME_DIR .. "src/emu/machine/netlist.h", MAME_DIR .. "src/emu/machine/nvram.c", MAME_DIR .. "src/emu/machine/nvram.h", MAME_DIR .. "src/emu/machine/ram.c", @@ -358,7 +365,7 @@ function emuProject(_target, _subtarget) project ("optional") uuid (os.uuid("optional-" .. _target .."_" .. _subtarget)) - kind "StaticLib" + kind (LIBTYPE) targetsubdir(_target .."_" .. _subtarget) options { "ForceCPP", @@ -372,8 +379,6 @@ function emuProject(_target, _subtarget) MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", - MAME_DIR .. "3rdparty/lua/src", - MAME_DIR .. "3rdparty/zlib", GEN_DIR .. "emu", GEN_DIR .. "emu/layout", MAME_DIR .. "src/emu/cpu/m68000", @@ -383,21 +388,32 @@ function emuProject(_target, _subtarget) MAME_DIR .. "3rdparty/expat/lib", } end + if _OPTIONS["with-bundled-zlib"] then + includedirs { + MAME_DIR .. "3rdparty/zlib", + } + end + if _OPTIONS["with-bundled-lua"] then + includedirs { + MAME_DIR .. "3rdparty/lua/src", + } + end dofile(path.join("src", "cpu.lua")) dofile(path.join("src", "sound.lua")) - dofile(path.join("src", "netlist.lua")) dofile(path.join("src", "video.lua")) dofile(path.join("src", "machine.lua")) + -- netlist now defines a project + dofile(path.join("src", "netlist.lua")) project ("bus") uuid ("5d782c89-cf7e-4cfe-8f9f-0d4bfc16c91d") - kind "StaticLib" + kind (LIBTYPE) targetsubdir(_target .."_" .. _subtarget) options { "ForceCPP", @@ -410,8 +426,6 @@ function emuProject(_target, _subtarget) MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", - MAME_DIR .. "3rdparty/lua/src", - MAME_DIR .. "3rdparty/zlib", MAME_DIR .. "src/mess", -- some mess bus devices need this MAME_DIR .. "src/mame", -- used for nes bus devices GEN_DIR .. "emu", @@ -422,13 +436,23 @@ function emuProject(_target, _subtarget) MAME_DIR .. "3rdparty/expat/lib", } end + if _OPTIONS["with-bundled-zlib"] then + includedirs { + MAME_DIR .. "3rdparty/zlib", + } + end + if _OPTIONS["with-bundled-lua"] then + includedirs { + MAME_DIR .. "3rdparty/lua/src", + } + end dofile(path.join("src", "bus.lua")) project ("dasm") uuid ("f2d28b0a-6da5-4f78-b629-d834aa00429d") - kind "StaticLib" + kind (LIBTYPE) targetsubdir(_target .."_" .. _subtarget) options { "ForceCPP", @@ -440,8 +464,6 @@ function emuProject(_target, _subtarget) MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", - MAME_DIR .. "3rdparty/lua/src", - MAME_DIR .. "3rdparty/zlib", GEN_DIR .. "emu", } if _OPTIONS["with-bundled-expat"] then @@ -449,6 +471,16 @@ function emuProject(_target, _subtarget) MAME_DIR .. "3rdparty/expat/lib", } end + if _OPTIONS["with-bundled-zlib"] then + includedirs { + MAME_DIR .. "3rdparty/zlib", + } + end + if _OPTIONS["with-bundled-lua"] then + includedirs { + MAME_DIR .. "3rdparty/lua/src", + } + end files { disasm_files diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua index 54540f0f630..d081ef6665f 100644 --- a/scripts/src/lib.lua +++ b/scripts/src/lib.lua @@ -2,8 +2,9 @@ -- copyright-holders:MAMEdev Team project "utils" + targetsubdir(_OPTIONS["target"] .."_" .. _OPTIONS["subtarget"]) uuid "22489ad0-4cb2-4d91-ad81-24b0d80ca30a" - kind "StaticLib" + kind (LIBTYPE) options { "ForceCPP", @@ -13,13 +14,17 @@ project "utils" MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", - MAME_DIR .. "3rdparty/zlib", } if _OPTIONS["with-bundled-expat"] then includedirs { MAME_DIR .. "3rdparty/expat/lib", } end + if _OPTIONS["with-bundled-zlib"] then + includedirs { + MAME_DIR .. "3rdparty/zlib", + } + end files { MAME_DIR .. "src/lib/util/bitstream.h", @@ -94,8 +99,9 @@ project "utils" project "formats" + targetsubdir(_OPTIONS["target"] .."_" .. _OPTIONS["subtarget"]) uuid "f69636b1-fcce-45ce-b09a-113e371a2d7a" - kind "StaticLib" + kind (LIBTYPE) options { "ForceCPP", @@ -108,10 +114,17 @@ project "formats" MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", - MAME_DIR .. "3rdparty/zlib", } + if _OPTIONS["with-bundled-zlib"] then + includedirs { + MAME_DIR .. "3rdparty/zlib", + } + end + files { + MAME_DIR .. "src/lib/formats/2d_dsk.c", + MAME_DIR .. "src/lib/formats/2d_dsk.h", MAME_DIR .. "src/lib/formats/cassimg.c", MAME_DIR .. "src/lib/formats/cassimg.h", MAME_DIR .. "src/lib/formats/flopimg.c", @@ -154,10 +167,10 @@ project "formats" MAME_DIR .. "src/lib/formats/asst128_dsk.h", MAME_DIR .. "src/lib/formats/atari_dsk.c", MAME_DIR .. "src/lib/formats/atari_dsk.h", - MAME_DIR .. "src/lib/formats/atarist_dsk.c", - 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", @@ -176,14 +189,14 @@ project "formats" MAME_DIR .. "src/lib/formats/cbm_tap.h", MAME_DIR .. "src/lib/formats/ccvf_dsk.c", MAME_DIR .. "src/lib/formats/ccvf_dsk.h", + MAME_DIR .. "src/lib/formats/cd90_640_dsk.c", + MAME_DIR .. "src/lib/formats/cd90_640_dsk.h", MAME_DIR .. "src/lib/formats/cgen_cas.c", MAME_DIR .. "src/lib/formats/cgen_cas.h", MAME_DIR .. "src/lib/formats/cgenie_dsk.c", MAME_DIR .. "src/lib/formats/cgenie_dsk.h", MAME_DIR .. "src/lib/formats/coco_cas.c", MAME_DIR .. "src/lib/formats/coco_cas.h", - MAME_DIR .. "src/lib/formats/coco_dsk.c", - MAME_DIR .. "src/lib/formats/coco_dsk.h", MAME_DIR .. "src/lib/formats/comx35_dsk.c", MAME_DIR .. "src/lib/formats/comx35_dsk.h", MAME_DIR .. "src/lib/formats/concept_dsk.c", @@ -251,12 +264,16 @@ project "formats" MAME_DIR .. "src/lib/formats/hect_dsk.h", MAME_DIR .. "src/lib/formats/hect_tap.c", MAME_DIR .. "src/lib/formats/hect_tap.h", + MAME_DIR .. "src/lib/formats/hector_minidisc.c", + MAME_DIR .. "src/lib/formats/hector_minidisc.h", MAME_DIR .. "src/lib/formats/iq151_dsk.c", MAME_DIR .. "src/lib/formats/iq151_dsk.h", MAME_DIR .. "src/lib/formats/imd_dsk.c", MAME_DIR .. "src/lib/formats/imd_dsk.h", MAME_DIR .. "src/lib/formats/ipf_dsk.c", MAME_DIR .. "src/lib/formats/ipf_dsk.h", + MAME_DIR .. "src/lib/formats/jvc_dsk.c", + MAME_DIR .. "src/lib/formats/jvc_dsk.h", MAME_DIR .. "src/lib/formats/kaypro_dsk.c", MAME_DIR .. "src/lib/formats/kaypro_dsk.h", MAME_DIR .. "src/lib/formats/kc_cas.c", @@ -309,6 +326,8 @@ project "formats" MAME_DIR .. "src/lib/formats/pc98fdi_dsk.h", MAME_DIR .. "src/lib/formats/phc25_cas.c", MAME_DIR .. "src/lib/formats/phc25_cas.h", + MAME_DIR .. "src/lib/formats/pk8020_dsk.c", + MAME_DIR .. "src/lib/formats/pk8020_dsk.h", MAME_DIR .. "src/lib/formats/pmd_cas.c", MAME_DIR .. "src/lib/formats/pmd_cas.h", MAME_DIR .. "src/lib/formats/primoptp.c", @@ -359,8 +378,8 @@ project "formats" MAME_DIR .. "src/lib/formats/trd_dsk.h", MAME_DIR .. "src/lib/formats/trs_cas.c", MAME_DIR .. "src/lib/formats/trs_cas.h", - MAME_DIR .. "src/lib/formats/trs_dsk.c", - MAME_DIR .. "src/lib/formats/trs_dsk.h", + MAME_DIR .. "src/lib/formats/trs80_dsk.c", + MAME_DIR .. "src/lib/formats/trs80_dsk.h", MAME_DIR .. "src/lib/formats/tvc_cas.c", MAME_DIR .. "src/lib/formats/tvc_cas.h", MAME_DIR .. "src/lib/formats/tvc_dsk.c", @@ -371,16 +390,16 @@ project "formats" MAME_DIR .. "src/lib/formats/uef_cas.h", MAME_DIR .. "src/lib/formats/upd765_dsk.c", MAME_DIR .. "src/lib/formats/upd765_dsk.h", + MAME_DIR .. "src/lib/formats/vdk_dsk.c", + MAME_DIR .. "src/lib/formats/vdk_dsk.h", + MAME_DIR .. "src/lib/formats/vector06_dsk.c", + MAME_DIR .. "src/lib/formats/vector06_dsk.h", MAME_DIR .. "src/lib/formats/victor9k_dsk.c", MAME_DIR .. "src/lib/formats/victor9k_dsk.h", MAME_DIR .. "src/lib/formats/vg5k_cas.c", MAME_DIR .. "src/lib/formats/vg5k_cas.h", MAME_DIR .. "src/lib/formats/vt_cas.c", MAME_DIR .. "src/lib/formats/vt_cas.h", - MAME_DIR .. "src/lib/formats/vt_dsk.c", - MAME_DIR .. "src/lib/formats/vt_dsk.h", - MAME_DIR .. "src/lib/formats/vtech1_dsk.c", - MAME_DIR .. "src/lib/formats/vtech1_dsk.h", MAME_DIR .. "src/lib/formats/wavfile.c", MAME_DIR .. "src/lib/formats/wavfile.h", MAME_DIR .. "src/lib/formats/wd177x_dsk.c", @@ -391,8 +410,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 528cebbd3d2..a11d535b673 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -2243,18 +2243,6 @@ end --------------------------------------------------- -- ---@src/emu/machine/wd17xx.h,MACHINES += WD17XX ---------------------------------------------------- - -if (MACHINES["WD17XX"]~=null) then - files { - MAME_DIR .. "src/emu/machine/wd17xx.c", - MAME_DIR .. "src/emu/machine/wd17xx.h", - } -end - ---------------------------------------------------- --- --@src/emu/machine/wd2010.h,MACHINES += WD2010 --------------------------------------------------- @@ -2662,3 +2650,14 @@ if (MACHINES["PCI9050"]~=null) then } end +--------------------------------------------------- +-- +--@src/emu/machine/netlist.h,MACHINES += NETLIST +--------------------------------------------------- + +if (MACHINES["NETLIST"]~=null) then + files { + MAME_DIR .. "src/emu/machine/netlist.c", + MAME_DIR .. "src/emu/machine/netlist.h", + } +end diff --git a/scripts/src/main.lua b/scripts/src/main.lua index 9559eb1f594..6bbdc01833c 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -87,6 +87,7 @@ function mainProject(_target, _subtarget) links { "osd_" .. _OPTIONS["osd"], "bus", + "netlist", "optional", "emu", "dasm", @@ -94,16 +95,44 @@ function mainProject(_target, _subtarget) "expat", "softfloat", "jpeg", - "flac", "7z", "formats", "lua", "lsqlite3", - "sqllite3", - "zlib", "jsoncpp", "mongoose", } + + if _OPTIONS["with-bundled-zlib"] then + links { + "zlib", + } + else + links { + "z", + } + end + + if _OPTIONS["with-bundled-flac"] then + links { + "flac", + } + else + links { + "FLAC", + } + end + + if _OPTIONS["with-bundled-sqlite3"] then + links { + "sqllite3", + } + else + links { + "sqlite3", + } + end + if _OPTIONS["NO_USE_MIDI"]~="1" then links { "portmidi", @@ -129,11 +158,16 @@ function mainProject(_target, _subtarget) MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", - MAME_DIR .. "3rdparty/zlib", GEN_DIR .. _target .. "/layout", GEN_DIR .. "resource", } + if _OPTIONS["with-bundled-zlib"] then + includedirs { + MAME_DIR .. "3rdparty/zlib", + } + end + if _OPTIONS["targetos"]=="macosx" and (not override_resources) then linkoptions { "-sectcreate __TEXT __info_plist " .. GEN_DIR .. "/resource/" .. _subtarget .. "-Info.plist" diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua index d1f9c97a74b..b0e3f0cab0b 100644 --- a/scripts/src/netlist.lua +++ b/scripts/src/netlist.lua @@ -1,126 +1,152 @@ -- license:BSD-3-Clause -- copyright-holders:MAMEdev Team -files { - MAME_DIR .. "src/emu/netlist/nl_config.h", - MAME_DIR .. "src/emu/netlist/nl_dice_compat.h", - 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/nl_base.c", - MAME_DIR .. "src/emu/netlist/nl_base.h", - MAME_DIR .. "src/emu/netlist/nl_parser.c", - MAME_DIR .. "src/emu/netlist/nl_parser.h", - MAME_DIR .. "src/emu/netlist/nl_setup.c", - 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/pconfig.h", - MAME_DIR .. "src/emu/netlist/palloc.c", - MAME_DIR .. "src/emu/netlist/palloc.h", - MAME_DIR .. "src/emu/netlist/plists.h", - MAME_DIR .. "src/emu/netlist/pparser.c", - MAME_DIR .. "src/emu/netlist/pparser.h", - MAME_DIR .. "src/emu/netlist/pstate.c", - MAME_DIR .. "src/emu/netlist/pstate.h", - MAME_DIR .. "src/emu/netlist/pstring.c", - MAME_DIR .. "src/emu/netlist/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", - MAME_DIR .. "src/emu/netlist/analog/nld_fourterm.h", - MAME_DIR .. "src/emu/netlist/analog/nld_solver.c", - MAME_DIR .. "src/emu/netlist/analog/nld_solver.h", - MAME_DIR .. "src/emu/netlist/analog/nld_switches.c", - MAME_DIR .. "src/emu/netlist/analog/nld_switches.h", - MAME_DIR .. "src/emu/netlist/analog/nld_twoterm.c", - MAME_DIR .. "src/emu/netlist/analog/nld_twoterm.h", - MAME_DIR .. "src/emu/netlist/analog/nld_opamps.c", - MAME_DIR .. "src/emu/netlist/analog/nld_opamps.h", - MAME_DIR .. "src/emu/netlist/analog/nld_ms_direct.h", - MAME_DIR .. "src/emu/netlist/analog/nld_ms_direct1.h", - MAME_DIR .. "src/emu/netlist/analog/nld_ms_direct2.h", - MAME_DIR .. "src/emu/netlist/analog/nld_ms_gauss_seidel.h", - MAME_DIR .. "src/emu/netlist/devices/nld_4020.c", - MAME_DIR .. "src/emu/netlist/devices/nld_4020.h", - MAME_DIR .. "src/emu/netlist/devices/nld_4066.c", - MAME_DIR .. "src/emu/netlist/devices/nld_4066.h", - MAME_DIR .. "src/emu/netlist/devices/nld_7400.c", - MAME_DIR .. "src/emu/netlist/devices/nld_7400.h", - MAME_DIR .. "src/emu/netlist/devices/nld_7402.c", - MAME_DIR .. "src/emu/netlist/devices/nld_7402.h", - MAME_DIR .. "src/emu/netlist/devices/nld_7404.c", - MAME_DIR .. "src/emu/netlist/devices/nld_7404.h", - MAME_DIR .. "src/emu/netlist/devices/nld_7408.c", - MAME_DIR .. "src/emu/netlist/devices/nld_7408.h", - MAME_DIR .. "src/emu/netlist/devices/nld_7410.c", - MAME_DIR .. "src/emu/netlist/devices/nld_7410.h", - MAME_DIR .. "src/emu/netlist/devices/nld_7411.c", - MAME_DIR .. "src/emu/netlist/devices/nld_7411.h", - MAME_DIR .. "src/emu/netlist/devices/nld_7420.c", - MAME_DIR .. "src/emu/netlist/devices/nld_7420.h", - MAME_DIR .. "src/emu/netlist/devices/nld_7425.c", - MAME_DIR .. "src/emu/netlist/devices/nld_7425.h", - MAME_DIR .. "src/emu/netlist/devices/nld_7427.c", - MAME_DIR .. "src/emu/netlist/devices/nld_7427.h", - MAME_DIR .. "src/emu/netlist/devices/nld_7430.c", - MAME_DIR .. "src/emu/netlist/devices/nld_7430.h", - MAME_DIR .. "src/emu/netlist/devices/nld_7432.c", - MAME_DIR .. "src/emu/netlist/devices/nld_7432.h", - MAME_DIR .. "src/emu/netlist/devices/nld_7437.c", - MAME_DIR .. "src/emu/netlist/devices/nld_7437.h", - MAME_DIR .. "src/emu/netlist/devices/nld_7448.c", - MAME_DIR .. "src/emu/netlist/devices/nld_7448.h", - MAME_DIR .. "src/emu/netlist/devices/nld_7450.c", - MAME_DIR .. "src/emu/netlist/devices/nld_7450.h", - MAME_DIR .. "src/emu/netlist/devices/nld_7474.c", - MAME_DIR .. "src/emu/netlist/devices/nld_7474.h", - MAME_DIR .. "src/emu/netlist/devices/nld_7483.c", - MAME_DIR .. "src/emu/netlist/devices/nld_7483.h", - MAME_DIR .. "src/emu/netlist/devices/nld_7486.c", - MAME_DIR .. "src/emu/netlist/devices/nld_7486.h", - MAME_DIR .. "src/emu/netlist/devices/nld_7490.c", - MAME_DIR .. "src/emu/netlist/devices/nld_7490.h", - MAME_DIR .. "src/emu/netlist/devices/nld_7493.c", - MAME_DIR .. "src/emu/netlist/devices/nld_7493.h", - MAME_DIR .. "src/emu/netlist/devices/nld_74107.c", - MAME_DIR .. "src/emu/netlist/devices/nld_74107.h", - MAME_DIR .. "src/emu/netlist/devices/nld_74123.c", - MAME_DIR .. "src/emu/netlist/devices/nld_74123.h", - MAME_DIR .. "src/emu/netlist/devices/nld_74153.c", - MAME_DIR .. "src/emu/netlist/devices/nld_74153.h", - MAME_DIR .. "src/emu/netlist/devices/nld_74175.c", - MAME_DIR .. "src/emu/netlist/devices/nld_74175.h", - MAME_DIR .. "src/emu/netlist/devices/nld_74192.c", - MAME_DIR .. "src/emu/netlist/devices/nld_74192.h", - MAME_DIR .. "src/emu/netlist/devices/nld_74193.c", - MAME_DIR .. "src/emu/netlist/devices/nld_74193.h", - MAME_DIR .. "src/emu/netlist/devices/nld_74279.c", - MAME_DIR .. "src/emu/netlist/devices/nld_74279.h", - MAME_DIR .. "src/emu/netlist/devices/nld_74ls629.c", - MAME_DIR .. "src/emu/netlist/devices/nld_74ls629.h", - MAME_DIR .. "src/emu/netlist/devices/nld_82S16.c", - MAME_DIR .. "src/emu/netlist/devices/nld_82S16.h", - MAME_DIR .. "src/emu/netlist/devices/nld_9310.c", - MAME_DIR .. "src/emu/netlist/devices/nld_9310.h", - MAME_DIR .. "src/emu/netlist/devices/nld_9312.c", - MAME_DIR .. "src/emu/netlist/devices/nld_9312.h", - MAME_DIR .. "src/emu/netlist/devices/nld_9316.c", - MAME_DIR .. "src/emu/netlist/devices/nld_9316.h", - MAME_DIR .. "src/emu/netlist/devices/nld_ne555.c", - MAME_DIR .. "src/emu/netlist/devices/nld_ne555.h", - MAME_DIR .. "src/emu/netlist/devices/nld_r2r_dac.c", - MAME_DIR .. "src/emu/netlist/devices/nld_r2r_dac.h", - MAME_DIR .. "src/emu/netlist/devices/nld_legacy.c", - MAME_DIR .. "src/emu/netlist/devices/nld_legacy.h", - MAME_DIR .. "src/emu/netlist/devices/net_lib.c", - MAME_DIR .. "src/emu/netlist/devices/net_lib.h", - MAME_DIR .. "src/emu/netlist/devices/nld_log.c", - MAME_DIR .. "src/emu/netlist/devices/nld_log.h", - MAME_DIR .. "src/emu/netlist/devices/nld_system.c", - MAME_DIR .. "src/emu/netlist/devices/nld_system.h", - MAME_DIR .. "src/emu/netlist/devices/nld_cmos.h", - 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", +project "netlist" + targetsubdir(_OPTIONS["target"] .."_" .. _OPTIONS["subtarget"]) + uuid "665ef8ac-2a4c-4c3e-a05f-fd1e5db11de9" + kind (LIBTYPE) + + options { + "ForceCPP", + } + + includedirs { + MAME_DIR .. "src/emu/netlist", + MAME_DIR .. "src/osd", + MAME_DIR .. "src/lib/util", + } + -- if _OPTIONS["with-bundled-expat"] then + -- includedirs { + -- MAME_DIR .. "3rdparty/expat/lib", + -- } + --end + + + files { + MAME_DIR .. "src/emu/netlist/nl_config.h", + MAME_DIR .. "src/emu/netlist/nl_dice_compat.h", + 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/nl_base.c", + MAME_DIR .. "src/emu/netlist/nl_base.h", + MAME_DIR .. "src/emu/netlist/nl_parser.c", + MAME_DIR .. "src/emu/netlist/nl_parser.h", + MAME_DIR .. "src/emu/netlist/nl_setup.c", + 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/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/plib/pstring.c", + MAME_DIR .. "src/emu/netlist/plib/pstring.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", + MAME_DIR .. "src/emu/netlist/analog/nld_bjt.h", + MAME_DIR .. "src/emu/netlist/analog/nld_fourterm.c", + MAME_DIR .. "src/emu/netlist/analog/nld_fourterm.h", + MAME_DIR .. "src/emu/netlist/analog/nld_solver.c", + MAME_DIR .. "src/emu/netlist/analog/nld_solver.h", + MAME_DIR .. "src/emu/netlist/analog/nld_switches.c", + MAME_DIR .. "src/emu/netlist/analog/nld_switches.h", + MAME_DIR .. "src/emu/netlist/analog/nld_twoterm.c", + MAME_DIR .. "src/emu/netlist/analog/nld_twoterm.h", + MAME_DIR .. "src/emu/netlist/analog/nld_opamps.c", + MAME_DIR .. "src/emu/netlist/analog/nld_opamps.h", + MAME_DIR .. "src/emu/netlist/analog/nld_ms_direct.h", + MAME_DIR .. "src/emu/netlist/analog/nld_ms_direct1.h", + MAME_DIR .. "src/emu/netlist/analog/nld_ms_direct2.h", + MAME_DIR .. "src/emu/netlist/analog/nld_ms_gauss_seidel.h", + MAME_DIR .. "src/emu/netlist/devices/nld_4020.c", + MAME_DIR .. "src/emu/netlist/devices/nld_4020.h", + MAME_DIR .. "src/emu/netlist/devices/nld_4066.c", + MAME_DIR .. "src/emu/netlist/devices/nld_4066.h", + MAME_DIR .. "src/emu/netlist/devices/nld_7400.c", + MAME_DIR .. "src/emu/netlist/devices/nld_7400.h", + MAME_DIR .. "src/emu/netlist/devices/nld_7402.c", + MAME_DIR .. "src/emu/netlist/devices/nld_7402.h", + MAME_DIR .. "src/emu/netlist/devices/nld_7404.c", + MAME_DIR .. "src/emu/netlist/devices/nld_7404.h", + MAME_DIR .. "src/emu/netlist/devices/nld_7408.c", + MAME_DIR .. "src/emu/netlist/devices/nld_7408.h", + MAME_DIR .. "src/emu/netlist/devices/nld_7410.c", + MAME_DIR .. "src/emu/netlist/devices/nld_7410.h", + MAME_DIR .. "src/emu/netlist/devices/nld_7411.c", + MAME_DIR .. "src/emu/netlist/devices/nld_7411.h", + MAME_DIR .. "src/emu/netlist/devices/nld_7420.c", + MAME_DIR .. "src/emu/netlist/devices/nld_7420.h", + MAME_DIR .. "src/emu/netlist/devices/nld_7425.c", + MAME_DIR .. "src/emu/netlist/devices/nld_7425.h", + MAME_DIR .. "src/emu/netlist/devices/nld_7427.c", + MAME_DIR .. "src/emu/netlist/devices/nld_7427.h", + MAME_DIR .. "src/emu/netlist/devices/nld_7430.c", + MAME_DIR .. "src/emu/netlist/devices/nld_7430.h", + MAME_DIR .. "src/emu/netlist/devices/nld_7432.c", + MAME_DIR .. "src/emu/netlist/devices/nld_7432.h", + MAME_DIR .. "src/emu/netlist/devices/nld_7437.c", + MAME_DIR .. "src/emu/netlist/devices/nld_7437.h", + MAME_DIR .. "src/emu/netlist/devices/nld_7448.c", + MAME_DIR .. "src/emu/netlist/devices/nld_7448.h", + MAME_DIR .. "src/emu/netlist/devices/nld_7450.c", + MAME_DIR .. "src/emu/netlist/devices/nld_7450.h", + MAME_DIR .. "src/emu/netlist/devices/nld_7474.c", + MAME_DIR .. "src/emu/netlist/devices/nld_7474.h", + MAME_DIR .. "src/emu/netlist/devices/nld_7483.c", + MAME_DIR .. "src/emu/netlist/devices/nld_7483.h", + MAME_DIR .. "src/emu/netlist/devices/nld_7486.c", + MAME_DIR .. "src/emu/netlist/devices/nld_7486.h", + MAME_DIR .. "src/emu/netlist/devices/nld_7490.c", + MAME_DIR .. "src/emu/netlist/devices/nld_7490.h", + MAME_DIR .. "src/emu/netlist/devices/nld_7493.c", + MAME_DIR .. "src/emu/netlist/devices/nld_7493.h", + MAME_DIR .. "src/emu/netlist/devices/nld_74107.c", + MAME_DIR .. "src/emu/netlist/devices/nld_74107.h", + MAME_DIR .. "src/emu/netlist/devices/nld_74123.c", + MAME_DIR .. "src/emu/netlist/devices/nld_74123.h", + MAME_DIR .. "src/emu/netlist/devices/nld_74153.c", + MAME_DIR .. "src/emu/netlist/devices/nld_74153.h", + MAME_DIR .. "src/emu/netlist/devices/nld_74175.c", + MAME_DIR .. "src/emu/netlist/devices/nld_74175.h", + MAME_DIR .. "src/emu/netlist/devices/nld_74192.c", + MAME_DIR .. "src/emu/netlist/devices/nld_74192.h", + MAME_DIR .. "src/emu/netlist/devices/nld_74193.c", + MAME_DIR .. "src/emu/netlist/devices/nld_74193.h", + MAME_DIR .. "src/emu/netlist/devices/nld_74279.c", + MAME_DIR .. "src/emu/netlist/devices/nld_74279.h", + MAME_DIR .. "src/emu/netlist/devices/nld_74ls629.c", + MAME_DIR .. "src/emu/netlist/devices/nld_74ls629.h", + MAME_DIR .. "src/emu/netlist/devices/nld_82S16.c", + MAME_DIR .. "src/emu/netlist/devices/nld_82S16.h", + MAME_DIR .. "src/emu/netlist/devices/nld_9310.c", + MAME_DIR .. "src/emu/netlist/devices/nld_9310.h", + MAME_DIR .. "src/emu/netlist/devices/nld_9312.c", + MAME_DIR .. "src/emu/netlist/devices/nld_9312.h", + MAME_DIR .. "src/emu/netlist/devices/nld_9316.c", + MAME_DIR .. "src/emu/netlist/devices/nld_9316.h", + MAME_DIR .. "src/emu/netlist/devices/nld_ne555.c", + MAME_DIR .. "src/emu/netlist/devices/nld_ne555.h", + MAME_DIR .. "src/emu/netlist/devices/nld_r2r_dac.c", + MAME_DIR .. "src/emu/netlist/devices/nld_r2r_dac.h", + MAME_DIR .. "src/emu/netlist/devices/nld_legacy.c", + MAME_DIR .. "src/emu/netlist/devices/nld_legacy.h", + MAME_DIR .. "src/emu/netlist/devices/net_lib.c", + MAME_DIR .. "src/emu/netlist/devices/net_lib.h", + MAME_DIR .. "src/emu/netlist/devices/nld_log.c", + MAME_DIR .. "src/emu/netlist/devices/nld_log.h", + MAME_DIR .. "src/emu/netlist/devices/nld_system.c", + MAME_DIR .. "src/emu/netlist/devices/nld_system.h", + MAME_DIR .. "src/emu/netlist/devices/nld_cmos.h", + 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", } diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua index a1b19f9cb2a..b4afaaa6532 100644 --- a/scripts/src/osd/osdmini.lua +++ b/scripts/src/osd/osdmini.lua @@ -7,7 +7,7 @@ end project ("osd_" .. _OPTIONS["osd"]) uuid (os.uuid("osd_" .. _OPTIONS["osd"])) - kind "StaticLib" + kind (LIBTYPE) removeflags { "SingleOutputDir", @@ -54,7 +54,7 @@ project ("osd_" .. _OPTIONS["osd"]) project ("ocore_" .. _OPTIONS["osd"]) uuid (os.uuid("ocore_" .. _OPTIONS["osd"])) - kind "StaticLib" + kind (LIBTYPE) options { "ForceCPP", diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 2c8e2ed51c5..0358881562f 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -102,6 +102,11 @@ newoption { } newoption { + trigger = "SDL_INI_PATH", + description = "Default search path for .ini files", +} + +newoption { trigger = "NO_X11", description = "Disable use of X11", allowed = { @@ -293,8 +298,9 @@ end project ("osd_" .. _OPTIONS["osd"]) + targetsubdir(_OPTIONS["target"] .."_" .._OPTIONS["subtarget"]) uuid (os.uuid("osd_" .. _OPTIONS["osd"])) - kind "StaticLib" + kind (LIBTYPE) dofile("sdl_cfg.lua") osdmodulesbuild() @@ -361,8 +367,9 @@ project ("osd_" .. _OPTIONS["osd"]) project ("ocore_" .. _OPTIONS["osd"]) + targetsubdir(_OPTIONS["target"] .."_" .. _OPTIONS["subtarget"]) uuid (os.uuid("ocore_" .. _OPTIONS["osd"])) - kind "StaticLib" + kind (LIBTYPE) options { "ForceCPP", diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua index a26d80f197b..a204201d6f5 100644 --- a/scripts/src/osd/sdl_cfg.lua +++ b/scripts/src/osd/sdl_cfg.lua @@ -18,6 +18,11 @@ if _OPTIONS["NO_OPENGL"]~="1" and _OPTIONS["USE_DISPATCH_GL"]~="1" and _OPTIONS[ } end +if _OPTIONS["SDL_INI_PATH"]~=nil then + defines { + "'INI_PATH=\"" .. _OPTIONS["SDL_INI_PATH"] .. "\"'", + } +end if _OPTIONS["NO_X11"]=="1" then defines { diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index 33176ff43fc..e9965017933 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -90,7 +90,7 @@ end project ("osd_" .. _OPTIONS["osd"]) uuid (os.uuid("osd_" .. _OPTIONS["osd"])) - kind "StaticLib" + kind (LIBTYPE) dofile("windows_cfg.lua") osdmodulesbuild() @@ -153,7 +153,7 @@ project ("osd_" .. _OPTIONS["osd"]) project ("ocore_" .. _OPTIONS["osd"]) uuid (os.uuid("ocore_" .. _OPTIONS["osd"])) - kind "StaticLib" + kind (LIBTYPE) options { "ForceCPP", 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..55f966eed2e 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -24,10 +24,19 @@ end links { "utils", "expat", - "zlib", "ocore_" .. _OPTIONS["osd"], } +if _OPTIONS["with-bundled-zlib"] then + links { + "zlib", + } +else + links { + "z", + } +end + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -60,12 +69,30 @@ end links { "utils", "expat", - "zlib", - "flac", "7z", "ocore_" .. _OPTIONS["osd"], } +if _OPTIONS["with-bundled-zlib"] then + links { + "zlib", + } +else + links { + "z", + } +end + +if _OPTIONS["with-bundled-flac"] then + links { + "flac", + } +else + links { + "FLAC", + } +end + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -100,10 +127,19 @@ end links { "utils", "expat", - "zlib", "ocore_" .. _OPTIONS["osd"], } +if _OPTIONS["with-bundled-zlib"] then + links { + "zlib", + } +else + links { + "z", + } +end + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -138,12 +174,30 @@ links { "emu", "utils", "expat", - "zlib", - "flac", "7z", "ocore_" .. _OPTIONS["osd"], } +if _OPTIONS["with-bundled-zlib"] then + links { + "zlib", + } +else + links { + "z", + } +end + +if _OPTIONS["with-bundled-flac"] then + links { + "flac", + } +else + links { + "FLAC", + } +end + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", @@ -179,12 +233,30 @@ end links { "utils", "expat", - "zlib", - "flac", "7z", "ocore_" .. _OPTIONS["osd"], } +if _OPTIONS["with-bundled-zlib"] then + links { + "zlib", + } +else + links { + "z", + } +end + +if _OPTIONS["with-bundled-flac"] then + links { + "flac", + } +else + links { + "FLAC", + } +end + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -218,12 +290,30 @@ end links { "utils", "expat", - "zlib", - "flac", "7z", "ocore_" .. _OPTIONS["osd"], } +if _OPTIONS["with-bundled-zlib"] then + links { + "zlib", + } +else + links { + "z", + } +end + +if _OPTIONS["with-bundled-flac"] then + links { + "flac", + } +else + links { + "FLAC", + } +end + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -257,10 +347,19 @@ end links { "utils", "expat", - "zlib", "ocore_" .. _OPTIONS["osd"], } +if _OPTIONS["with-bundled-zlib"] then + links { + "zlib", + } +else + links { + "z", + } +end + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -293,10 +392,19 @@ end links { "utils", "expat", - "zlib", "ocore_" .. _OPTIONS["osd"], } +if _OPTIONS["with-bundled-zlib"] then + links { + "zlib", + } +else + links { + "z", + } +end + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -329,10 +437,19 @@ end links { "utils", "expat", - "zlib", "ocore_" .. _OPTIONS["osd"], } +if _OPTIONS["with-bundled-zlib"] then + links { + "zlib", + } +else + links { + "z", + } +end + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -365,12 +482,30 @@ end links { "utils", "expat", - "zlib", - "flac", "7z", "ocore_" .. _OPTIONS["osd"], } +if _OPTIONS["with-bundled-zlib"] then + links { + "zlib", + } +else + links { + "z", + } +end + +if _OPTIONS["with-bundled-flac"] then + links { + "flac", + } +else + links { + "FLAC", + } +end + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -403,10 +538,19 @@ end links { "utils", "expat", - "zlib", "ocore_" .. _OPTIONS["osd"], } +if _OPTIONS["with-bundled-zlib"] then + links { + "zlib", + } +else + links { + "z", + } +end + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -439,24 +583,41 @@ end links { "utils", "expat", - "zlib", - "flac", "7z", "ocore_" .. _OPTIONS["osd"], + "netlist", } +if _OPTIONS["with-bundled-zlib"] then + links { + "zlib", + } +else + links { + "z", + } +end + +if _OPTIONS["with-bundled-flac"] then + links { + "flac", + } +else + links { + "FLAC", + } +end + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", - MAME_DIR .. "src/emu", + MAME_DIR .. "src/emu/netlist", } files { MAME_DIR .. "src/tools/nltool.c", } -dofile("netlist.lua") - -------------------------------------------------- -- castool -------------------------------------------------- @@ -481,12 +642,30 @@ links { "formats", "utils", "expat", - "zlib", - "flac", "7z", "ocore_" .. _OPTIONS["osd"], } +if _OPTIONS["with-bundled-zlib"] then + links { + "zlib", + } +else + links { + "z", + } +end + +if _OPTIONS["with-bundled-flac"] then + links { + "flac", + } +else + links { + "FLAC", + } +end + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib", @@ -522,12 +701,30 @@ links { "emu", "utils", "expat", - "zlib", - "flac", "7z", "ocore_" .. _OPTIONS["osd"], } +if _OPTIONS["with-bundled-zlib"] then + links { + "zlib", + } +else + links { + "z", + } +end + +if _OPTIONS["with-bundled-flac"] then + links { + "flac", + } +else + links { + "FLAC", + } +end + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib", @@ -563,12 +760,30 @@ links { "emu", "utils", "expat", - "zlib", - "flac", "7z", "ocore_" .. _OPTIONS["osd"], } +if _OPTIONS["with-bundled-zlib"] then + links { + "zlib", + } +else + links { + "z", + } +end + +if _OPTIONS["with-bundled-flac"] then + links { + "flac", + } +else + links { + "FLAC", + } +end + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib", @@ -590,6 +805,10 @@ files { MAME_DIR .. "src/mess/tools/imgtool/imgterrs.c", MAME_DIR .. "src/mess/tools/imgtool/imghd.c", MAME_DIR .. "src/mess/tools/imgtool/charconv.c", + MAME_DIR .. "src/mess/tools/imgtool/formats/vt_dsk.c", + MAME_DIR .. "src/mess/tools/imgtool/formats/vt_dsk.h", + MAME_DIR .. "src/mess/tools/imgtool/formats/coco_dsk.c", + MAME_DIR .. "src/mess/tools/imgtool/formats/coco_dsk.h", MAME_DIR .. "src/mess/tools/imgtool/modules/amiga.c", MAME_DIR .. "src/mess/tools/imgtool/modules/macbin.c", MAME_DIR .. "src/mess/tools/imgtool/modules/rsdos.c", |