summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/3rdparty.lua11
-rw-r--r--scripts/src/lib.lua10
-rw-r--r--scripts/src/main.lua37
-rw-r--r--scripts/src/netlist.lua14
-rw-r--r--scripts/src/osd/modules.lua44
-rw-r--r--scripts/src/osd/sdl.lua32
-rw-r--r--scripts/src/osd/windows.lua4
-rw-r--r--scripts/src/tools.lua62
-rw-r--r--scripts/src/video.lua2
9 files changed, 183 insertions, 33 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index e8c73eb3bae..39bc6b65e74 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -172,15 +172,10 @@ project "flac"
"_LARGEFILE_SOURCE",
"_FILE_OFFSET_BITS=64",
"FLAC__HAS_OGG=0",
+ "HAVE_CONFIG_H=1",
}
- configuration { "vs*" }
- defines {
- "VERSION=\"1.2.1\""
- }
- configuration { "gmake" }
- defines {
- "VERSION=\\\"1.2.1\\\""
- }
+
+ configuration { "gmake"}
buildoptions_c {
"-Wno-unused-function",
"-O0",
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua
index 557e9e7316c..147099a07df 100644
--- a/scripts/src/lib.lua
+++ b/scripts/src/lib.lua
@@ -17,8 +17,6 @@ project "utils"
files {
MAME_DIR .. "src/lib/util/bitstream.h",
MAME_DIR .. "src/lib/util/coretmpl.h",
- MAME_DIR .. "src/lib/util/astring.c",
- MAME_DIR .. "src/lib/util/astring.h",
MAME_DIR .. "src/lib/util/avhuff.c",
MAME_DIR .. "src/lib/util/avhuff.h",
MAME_DIR .. "src/lib/util/aviio.c",
@@ -157,6 +155,12 @@ project "formats"
MAME_DIR .. "src/lib/formats/bw2_dsk.h",
MAME_DIR .. "src/lib/formats/bw12_dsk.c",
MAME_DIR .. "src/lib/formats/bw12_dsk.h",
+ MAME_DIR .. "src/lib/formats/c3040_dsk.c",
+ MAME_DIR .. "src/lib/formats/c3040_dsk.h",
+ MAME_DIR .. "src/lib/formats/c4040_dsk.c",
+ 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/cbm_crt.c",
MAME_DIR .. "src/lib/formats/cbm_crt.h",
MAME_DIR .. "src/lib/formats/cbm_tap.c",
@@ -183,8 +187,6 @@ project "formats"
MAME_DIR .. "src/lib/formats/csw_cas.h",
MAME_DIR .. "src/lib/formats/d64_dsk.c",
MAME_DIR .. "src/lib/formats/d64_dsk.h",
- MAME_DIR .. "src/lib/formats/d67_dsk.c",
- MAME_DIR .. "src/lib/formats/d67_dsk.h",
MAME_DIR .. "src/lib/formats/d71_dsk.c",
MAME_DIR .. "src/lib/formats/d71_dsk.h",
MAME_DIR .. "src/lib/formats/d80_dsk.c",
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 8604987ffda..80e3d1bf09a 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -12,6 +12,7 @@ function mainProject(_target, _subtarget)
}
flags {
"NoManifest",
+ "Symbols", -- always include minimum symbols for executables
}
if _OPTIONS["SYMBOLS"] then
@@ -27,6 +28,42 @@ function mainProject(_target, _subtarget)
"Unicode",
}
+ configuration { "x64", "Release" }
+ targetsuffix "64"
+ if _OPTIONS["PROFILE"] then
+ targetsuffix "64p"
+ end
+
+ configuration { "x64", "Debug" }
+ targetsuffix "64d"
+ if _OPTIONS["PROFILE"] then
+ targetsuffix "64dp"
+ end
+
+ configuration { "x32", "Release" }
+ targetsuffix ""
+ if _OPTIONS["PROFILE"] then
+ targetsuffix "p"
+ end
+
+ configuration { "x32", "Debug" }
+ targetsuffix "d"
+ if _OPTIONS["PROFILE"] then
+ targetsuffix "dp"
+ end
+
+ configuration { "Native", "Release" }
+ targetsuffix ""
+ if _OPTIONS["PROFILE"] then
+ targetsuffix "p"
+ end
+
+ configuration { "Native", "Debug" }
+ targetsuffix "d"
+ if _OPTIONS["PROFILE"] then
+ targetsuffix "dp"
+ end
+
configuration { "mingw*" or "vs*" }
targetextension ".exe"
diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua
index be502f5ba5c..1670ebb9ba6 100644
--- a/scripts/src/netlist.lua
+++ b/scripts/src/netlist.lua
@@ -81,8 +81,22 @@ files {
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",
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index dd2e9a1cf8d..9bfdfb201c1 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -1,3 +1,29 @@
+function string.starts(String,Start)
+ return string.sub(String,1,string.len(Start))==Start
+end
+
+function addlibfromstring(str)
+ if (str==nil) then return end
+ for w in str:gmatch("%S+") do
+ if string.starts(w,"-l")==true then
+ links {
+ string.sub(w,3)
+ }
+ end
+ end
+end
+
+function addoptionsfromstring(str)
+ if (str==nil) then return end
+ for w in str:gmatch("%S+") do
+ if string.starts(w,"-l")==false then
+ linkoptions {
+ w
+ }
+ end
+ end
+end
+
function osdmodulesbuild()
removeflags {
@@ -191,9 +217,9 @@ function osdmodulestargetconf()
if _OPTIONS["NO_USE_MIDI"]~="1" then
if _OPTIONS["targetos"]=="linux" then
- linkoptions {
- backtick("pkg-config --libs alsa"),
- }
+ local str = backtick("pkg-config --libs alsa")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
elseif _OPTIONS["targetos"]=="macosx" then
links {
"CoreMIDI.framework",
@@ -223,13 +249,15 @@ function osdmodulestargetconf()
if _OPTIONS["QT_HOME"]~=nil then
linkoptions {
"-L" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_LIBS"),
- "-lQtGui",
- "-lQtCore",
}
- else
- linkoptions {
- backtick("pkg-config --libs QtGui"),
+ links {
+ "QtGui",
+ "QtCore",
}
+ else
+ local str = backtick("pkg-config --libs QtGui")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
end
end
end
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 8b713bf635a..6360e79a89e 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -37,9 +37,9 @@ function maintargetosdoptions(_target)
"SDL_ttf",
}
end
- linkoptions {
- backtick("pkg-config --libs fontconfig"),
- }
+ local str = backtick("pkg-config --libs fontconfig")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
end
if _OPTIONS["targetos"]=="windows" then
@@ -239,9 +239,9 @@ if BASE_TARGETOS=="unix" then
}
end
else
- linkoptions {
- backtick(sdlconfigcmd() .. " --libs | sed 's/-lSDLmain//'"),
- }
+ local str = backtick(sdlconfigcmd() .. " --libs | sed 's/-lSDLmain//'")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
end
else
if _OPTIONS["NO_X11"]=="1" then
@@ -259,9 +259,9 @@ if BASE_TARGETOS=="unix" then
}
end
end
- linkoptions {
- backtick(sdlconfigcmd() .. " --libs"),
- }
+ local str = backtick(sdlconfigcmd() .. " --libs")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
if _OPTIONS["targetos"]~="haiku" then
links {
"m",
@@ -280,9 +280,9 @@ if BASE_TARGETOS=="unix" then
end
end
elseif BASE_TARGETOS=="os2" then
- linkoptions {
- backtick(sdlconfigcmd() .. " --libs"),
- }
+ local str = backtick(sdlconfigcmd() .. " --libs")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
links {
"pthread"
}
@@ -422,6 +422,10 @@ if _OPTIONS["with-tools"] then
"ForceCPP",
}
+ flags {
+ "Symbols", -- always include minimum symbols for executables
+ }
+
dofile("sdl_cfg.lua")
includedirs {
@@ -480,6 +484,10 @@ if _OPTIONS["targetos"] == "macosx" and _OPTIONS["with-tools"] then
"ForceCPP",
}
+ flags {
+ "Symbols", -- always include minimum symbols for executables
+ }
+
dofile("sdl_cfg.lua")
if _OPTIONS["SEPARATE_BIN"]~="1" then
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index 8c6c5dd1cb7..d8636a2e3b1 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -217,6 +217,10 @@ if _OPTIONS["with-tools"] then
"ForceCPP",
}
+ flags {
+ "Symbols", -- always include minimum symbols for executables
+ }
+
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index cb7602a5b54..8c371f3b19a 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -10,6 +10,10 @@ options {
"ForceCPP",
}
+flags {
+ "Symbols", -- always include minimum symbols for executables
+}
+
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
@@ -42,6 +46,10 @@ options {
"ForceCPP",
}
+flags {
+ "Symbols", -- always include minimum symbols for executables
+}
+
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
@@ -78,6 +86,10 @@ options {
"ForceCPP",
}
+flags {
+ "Symbols", -- always include minimum symbols for executables
+}
+
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
@@ -110,6 +122,10 @@ options {
"ForceCPP",
}
+flags {
+ "Symbols", -- always include minimum symbols for executables
+}
+
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
@@ -149,6 +165,10 @@ options {
"ForceCPP",
}
+flags {
+ "Symbols", -- always include minimum symbols for executables
+}
+
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
@@ -184,6 +204,10 @@ options {
"ForceCPP",
}
+flags {
+ "Symbols", -- always include minimum symbols for executables
+}
+
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
@@ -219,6 +243,10 @@ options {
"ForceCPP",
}
+flags {
+ "Symbols", -- always include minimum symbols for executables
+}
+
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
@@ -251,6 +279,10 @@ options {
"ForceCPP",
}
+flags {
+ "Symbols", -- always include minimum symbols for executables
+}
+
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
@@ -283,6 +315,10 @@ options {
"ForceCPP",
}
+flags {
+ "Symbols", -- always include minimum symbols for executables
+}
+
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
@@ -315,6 +351,10 @@ options {
"ForceCPP",
}
+flags {
+ "Symbols", -- always include minimum symbols for executables
+}
+
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
@@ -349,6 +389,10 @@ options {
"ForceCPP",
}
+flags {
+ "Symbols", -- always include minimum symbols for executables
+}
+
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
@@ -381,6 +425,10 @@ options {
"ForceCPP",
}
+flags {
+ "Symbols", -- always include minimum symbols for executables
+}
+
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
@@ -407,7 +455,7 @@ files {
dofile("netlist.lua")
-if (_OPTIONS["target"]=="mess") then
+if (_OPTIONS["target"]~="mame") then
--------------------------------------------------
-- castool
--------------------------------------------------
@@ -420,6 +468,10 @@ options {
"ForceCPP",
}
+flags {
+ "Symbols", -- always include minimum symbols for executables
+}
+
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
@@ -456,6 +508,10 @@ options {
"ForceCPP",
}
+flags {
+ "Symbols", -- always include minimum symbols for executables
+}
+
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
@@ -493,6 +549,10 @@ options {
"ForceCPP",
}
+flags {
+ "Symbols", -- always include minimum symbols for executables
+}
+
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
diff --git a/scripts/src/video.lua b/scripts/src/video.lua
index 2b1db0f07bf..08c5539a4a8 100644
--- a/scripts/src/video.lua
+++ b/scripts/src/video.lua
@@ -493,6 +493,8 @@ if (VIDEOS["PC_VGA"]~=null) then
MAME_DIR .. "src/emu/video/pc_vga.h",
MAME_DIR .. "src/emu/bus/isa/trident.c",
MAME_DIR .. "src/emu/bus/isa/trident.h",
+ MAME_DIR .. "src/emu/video/clgd542x.c",
+ MAME_DIR .. "src/emu/video/blgd542x.h",
}
end