summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/bus.lua39
-rw-r--r--scripts/src/cpu.lua16
-rw-r--r--scripts/src/emu.lua30
-rw-r--r--scripts/src/lib.lua2
-rw-r--r--scripts/src/machine.lua18
-rw-r--r--scripts/src/netlist.lua2
-rw-r--r--scripts/src/osd/modules.lua21
-rw-r--r--scripts/src/osd/sdl_cfg.lua7
-rw-r--r--scripts/src/osd/windows.lua4
9 files changed, 97 insertions, 42 deletions
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index 07d1c468e93..1e8ab15f304 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -504,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
@@ -886,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",
@@ -1990,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 5092c86044d..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
--------------------------------------------------
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 b445f71a994..7d21cf3e5a2 100644
--- a/scripts/src/lib.lua
+++ b/scripts/src/lib.lua
@@ -296,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 55467f69264..6a3657129ef 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -2550,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
diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua
index 68f37f477dc..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",
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index a356986bbab..bf6897a2585 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -142,7 +142,7 @@ function osdmodulesbuild()
end
MOC = _OPTIONS["QT_HOME"] .. "/bin/moc"
else
- MOCTST = backtick("which moc-qt5 2>/dev/null")
+ MOCTST = backtick("which moc-qt4 2>/dev/null")
if (MOCTST=='') then
MOCTST = backtick("which moc 2>/dev/null")
end
@@ -185,7 +185,7 @@ function osdmodulesbuild()
}
else
buildoptions {
- backtick("pkg-config --cflags Qt5Widgets"),
+ backtick("pkg-config --cflags QtGui"),
}
end
end
@@ -237,18 +237,16 @@ function osdmodulestargetconf()
}
links {
"qtmain",
- "Qt5Core",
- "Qt5Gui",
- "Qt5Widgets",
+ "QtGui4",
+ "QtCore4",
}
elseif _OPTIONS["targetos"]=="macosx" then
linkoptions {
"-F" .. backtick("qmake -query QT_INSTALL_LIBS"),
}
links {
- "Qt5Core.framework",
- "Qt5Gui.framework",
- "Qt5Widgets.framework",
+ "QtCore.framework",
+ "QtGui.framework",
}
else
if _OPTIONS["QT_HOME"]~=nil then
@@ -256,12 +254,11 @@ function osdmodulestargetconf()
"-L" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_LIBS"),
}
links {
- "Qt5Core",
- "Qt5Gui",
- "Qt5Widgets",
+ "QtGui",
+ "QtCore",
}
else
- local str = backtick("pkg-config --libs Qt5Widgets")
+ local str = backtick("pkg-config --libs QtGui")
addlibfromstring(str)
addoptionsfromstring(str)
end
diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua
index f97548d06c2..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 {
@@ -125,7 +130,7 @@ elseif _OPTIONS["targetos"]=="linux" then
}
else
buildoptions {
- backtick("pkg-config --cflags Qt5Widgets"),
+ backtick("pkg-config --cflags QtGui"),
}
end
elseif _OPTIONS["targetos"]=="macosx" then
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index 8c0698a8db7..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 { }
@@ -34,7 +37,6 @@ function maintargetosdoptions(_target,_subtarget)
links {
"comctl32",
"comdlg32",
- "mingw32",
}
end