summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2015-05-22 18:39:34 +0200
committer ImJezze <jezze@gmx.net>2015-05-22 18:39:34 +0200
commit578f8b5bbe73e8381781ee56fd5982bbf3afda0e (patch)
tree98b89a26ce02a62e2132c42f060191f527cd2f80 /scripts/src
parenta7e221a4a7c1b20ea5bc43bfbbfdd0b2518ec9df (diff)
parent04f90c492063cfaac78f84d8c2beedb51b3a514f (diff)
Merge pull request #3 from mamedev/master
Sync to base master
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/3rdparty.lua15
-rw-r--r--scripts/src/bus.lua34
-rw-r--r--scripts/src/cpu.lua18
-rw-r--r--scripts/src/lib.lua4
-rw-r--r--scripts/src/main.lua20
-rw-r--r--scripts/src/netlist.lua1
-rw-r--r--scripts/src/osd/osdmini.lua2
-rw-r--r--scripts/src/osd/sdl.lua2
-rw-r--r--scripts/src/osd/windows.lua2
9 files changed, 85 insertions, 13 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index a401853f88b..aac32bfad74 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -272,6 +272,15 @@ project "lua"
uuid "d9e2eed1-f1ab-4737-a6ac-863700b1a5a9"
kind "StaticLib"
+ -- uncomment the options below to
+ -- compile using c++. Do the same
+ -- in lsqlite3.
+ -- In addition comment out the "extern "C""
+ -- in lua.hpp and do the same in luaengine.c line 47
+ --options {
+ -- "ForceCPP",
+ --}
+
configuration { }
defines {
"LUA_COMPAT_ALL",
@@ -342,6 +351,10 @@ project "lsqlite3"
uuid "1d84edab-94cf-48fb-83ee-b75bc697660e"
kind "StaticLib"
+ -- options {
+ -- "ForceCPP",
+ -- }
+
configuration { }
defines {
"LUA_COMPAT_ALL",
@@ -446,7 +459,7 @@ project "sqllite3"
--------------------------------------------------
-- portmidi library objects
--------------------------------------------------
-if _OPTIONS["NO_USE_MIDI"]=="0" then
+if _OPTIONS["NO_USE_MIDI"]~="1" then
project "portmidi"
uuid "587f2da6-3274-4a65-86a2-f13ea315bb98"
kind "StaticLib"
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index fb325a6376b..d499aabbef4 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -2414,3 +2414,37 @@ if (BUSES["PSX_CONTROLLER"]~=null) then
MAME_DIR .. "src/emu/bus/psx/memcard.h",
}
end
+
+---------------------------------------------------
+--
+--@src/emu/bus/nasbus/nasbus.h,BUSES += NASBUS
+---------------------------------------------------
+
+if (BUSES["NASBUS"]~=null) then
+ files {
+ MAME_DIR .. "src/emu/bus/nasbus/nasbus.c",
+ MAME_DIR .. "src/emu/bus/nasbus/nasbus.h",
+ MAME_DIR .. "src/emu/bus/nasbus/cards.c",
+ MAME_DIR .. "src/emu/bus/nasbus/cards.h",
+ MAME_DIR .. "src/emu/bus/nasbus/avc.c",
+ MAME_DIR .. "src/emu/bus/nasbus/avc.h",
+ MAME_DIR .. "src/emu/bus/nasbus/floppy.c",
+ MAME_DIR .. "src/emu/bus/nasbus/floppy.h",
+ }
+end
+
+---------------------------------------------------
+--
+--@src/emu/bus/cgenie/expansion.h,BUSES += CGENIE_EXPANSION
+---------------------------------------------------
+
+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",
+ }
+end
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index 88c12563126..68d93da6ec5 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -1052,6 +1052,24 @@ if (CPUS["PSX"]~=null or _OPTIONS["with-tools"]) then
end
--------------------------------------------------
+-- Mitsubishi MELPS 4 series
+---@src/emu/cpu/melps4/melps4.h,CPUS += MELPS4
+--------------------------------------------------
+
+if (CPUS["MELPS4"]~=null) then
+ files {
+ MAME_DIR .. "src/emu/cpu/melps4/melps4.c",
+ MAME_DIR .. "src/emu/cpu/melps4/melps4.h",
+ MAME_DIR .. "src/emu/cpu/melps4/m58846.c",
+ MAME_DIR .. "src/emu/cpu/melps4/m58846.h",
+ }
+end
+
+if (CPUS["MELPS4"]~=null or _OPTIONS["with-tools"]) then
+ table.insert(disasm_files , MAME_DIR .. "src/emu/cpu/melps4/melps4d.c")
+end
+
+--------------------------------------------------
-- Mitsubishi M37702 and M37710 (based on 65C816)
---@src/emu/cpu/m37710/m37710.h,CPUS += M37710
--------------------------------------------------
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua
index ba72f3cc140..d4738644375 100644
--- a/scripts/src/lib.lua
+++ b/scripts/src/lib.lua
@@ -176,6 +176,8 @@ project "formats"
MAME_DIR .. "src/lib/formats/ccvf_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",
@@ -279,6 +281,8 @@ project "formats"
MAME_DIR .. "src/lib/formats/mz_cas.h",
MAME_DIR .. "src/lib/formats/nanos_dsk.c",
MAME_DIR .. "src/lib/formats/nanos_dsk.h",
+ MAME_DIR .. "src/lib/formats/nascom_dsk.c",
+ MAME_DIR .. "src/lib/formats/nascom_dsk.h",
MAME_DIR .. "src/lib/formats/naslite_dsk.c",
MAME_DIR .. "src/lib/formats/naslite_dsk.h",
MAME_DIR .. "src/lib/formats/nes_dsk.c",
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 3cf80d968d0..80ac9c8b9c6 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -104,7 +104,7 @@ function mainProject(_target, _subtarget)
"jsoncpp",
"mongoose",
}
- if _OPTIONS["NO_USE_MIDI"]=="0" then
+ if _OPTIONS["NO_USE_MIDI"]~="1" then
links {
"portmidi",
}
@@ -120,7 +120,7 @@ function mainProject(_target, _subtarget)
override_resources = false;
- maintargetosdoptions(_target)
+ maintargetosdoptions(_target,_subtarget)
includedirs {
MAME_DIR .. "src/osd",
@@ -146,25 +146,27 @@ function mainProject(_target, _subtarget)
}
end
+ local rctarget = _subtarget
if _OPTIONS["targetos"]=="windows" and (not override_resources) then
- local rcfile = MAME_DIR .. "src/" .. _target .. "/osd/".._OPTIONS["osd"].."/" .. _subtarget .. "/" .. _subtarget ..".rc"
+ local rcfile = MAME_DIR .. "src/" .. _target .. "/osd/".._OPTIONS["osd"].."/" .. _subtarget .. "/" .. rctarget ..".rc"
if not os.isfile(rcfile) then
- rcfile = MAME_DIR .. "src/" .. _target .. "/osd/windows/" .. _subtarget .. "/" .. _subtarget ..".rc"
+ rcfile = MAME_DIR .. "src/" .. _target .. "/osd/windows/" .. _subtarget .. "/" .. rctarget ..".rc"
end
if os.isfile(rcfile) then
files {
rcfile,
}
dependency {
- { "$(OBJDIR)/".._subtarget ..".res" , GEN_DIR .. "/resource/" .. _subtarget .. "vers.rc", true },
+ { "$(OBJDIR)/".._subtarget ..".res" , GEN_DIR .. "/resource/" .. rctarget .. "vers.rc", true },
}
else
+ rctarget = "mame"
files {
MAME_DIR .. "src/mame/osd/windows/mame/mame.rc",
}
dependency {
- { "$(OBJDIR)/mame.res" , GEN_DIR .. "/resource/" .. _subtarget .. "vers.rc", true },
+ { "$(OBJDIR)/mame.res" , GEN_DIR .. "/resource/" .. rctarget .. "vers.rc", true },
}
end
end
@@ -185,14 +187,14 @@ function mainProject(_target, _subtarget)
configuration { "mingw*" }
custombuildtask {
- { MAME_DIR .. "src/version.c" , GEN_DIR .. "/resource/" .. _subtarget .. "vers.rc", { MAME_DIR .. "src/build/verinfo.py" }, {"@echo Emitting " .. _subtarget .. "vers.rc" .. "...", PYTHON .. " $(1) -r -b " .. _subtarget .. " $(<) > $(@)" }},
+ { 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 .. " $(<) > $(@)" }},
}
configuration { "vs*" }
prebuildcommands {
"mkdir " .. path.translate(GEN_DIR .. "/resource/","\\") .. " 2>NUL",
- "@echo Emitting ".. _subtarget .. "vers.rc...",
- PYTHON .. " " .. path.translate(MAME_DIR .. "src/build/verinfo.py","\\") .. " -r -b " .. _subtarget .. " " .. path.translate(MAME_DIR .. "src/version.c","\\") .. " > " .. path.translate(GEN_DIR .. "/resource/" .. _subtarget .. "vers.rc", "\\") ,
+ "@echo Emitting ".. rctarget .. "vers.rc...",
+ PYTHON .. " " .. path.translate(MAME_DIR .. "src/build/verinfo.py","\\") .. " -r -b " .. rctarget .. " " .. path.translate(MAME_DIR .. "src/version.c","\\") .. " > " .. path.translate(GEN_DIR .. "/resource/" .. rctarget .. "vers.rc", "\\") ,
}
diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua
index 3c0ded1383e..6c79eb1b463 100644
--- a/scripts/src/netlist.lua
+++ b/scripts/src/netlist.lua
@@ -116,5 +116,6 @@ files {
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 52b02c5f32c..a1b19f9cb2a 100644
--- a/scripts/src/osd/osdmini.lua
+++ b/scripts/src/osd/osdmini.lua
@@ -1,7 +1,7 @@
-- license:BSD-3-Clause
-- copyright-holders:MAMEdev Team
-function maintargetosdoptions(_target)
+function maintargetosdoptions(_target,_subtarget)
end
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 120a07cb0ec..2c8e2ed51c5 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -4,7 +4,7 @@
dofile("modules.lua")
-function maintargetosdoptions(_target)
+function maintargetosdoptions(_target,_subtarget)
osdmodulestargetconf()
if _OPTIONS["USE_DISPATCH_GL"]~="1" and _OPTIONS["MESA_INSTALL_ROOT"] then
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index fadfdd8da22..33176ff43fc 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -4,7 +4,7 @@
dofile("modules.lua")
-function maintargetosdoptions(_target)
+function maintargetosdoptions(_target,_subtarget)
osdmodulestargetconf()
configuration { "mingw*-gcc" }