summaryrefslogtreecommitdiffstats
path: root/scripts/src
diff options
context:
space:
mode:
author Ariane Fugmann <sailorsat@t-online.de>2017-01-26 19:55:37 +0100
committer Ariane Fugmann <sailorsat@t-online.de>2017-01-26 19:55:37 +0100
commitf603c763fe35a81bd3a7f41ab8a53c61c953e2cb (patch)
tree26b3659573426ea0111c3d5203b3eea78e508357 /scripts/src
parent4e5f922341d962577d19a62ee4ed21c7de1fc8f0 (diff)
parent4ba1c0f2cad36dc23613e0dec24e7e439d3e80fd (diff)
Merge branch 'master' of https://github.com/mamedev/mame
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/3rdparty.lua4
-rw-r--r--scripts/src/cpu.lua16
-rw-r--r--scripts/src/lib.lua1
-rw-r--r--scripts/src/osd/modules.lua4
-rw-r--r--scripts/src/osd/sdl.lua3
-rw-r--r--scripts/src/video.lua12
6 files changed, 37 insertions, 3 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 2cb7a145b91..e5b64df3ac0 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -917,14 +917,14 @@ project "portaudio"
"/wd4189", -- warning C4189: 'xxx' : local variable is initialized but not referenced
"/wd4127", -- warning C4127: conditional expression is constant
}
- if _OPTIONS["vs"]=="intel-15" then
+ if _OPTIONS["vs"]=="intel-15" then
buildoptions {
"/Qwd869", -- remark #869: parameter "xxx" was never referenced
"/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated
"/Qwd2544", -- message #2544: empty dependent statement in if-statement
"/Qwd1879", -- warning #1879: unimplemented pragma ignored
}
- end
+ end
configuration { "vs2015*" }
buildoptions {
"/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index 184a9310876..72a7ffea3fa 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -2415,3 +2415,19 @@ end
if (CPUS["MB86901"]~=null or _OPTIONS["with-tools"]) then
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/sparc/sparcdasm.cpp")
end
+
+--------------------------------------------------
+-- Intergraph CLIPPER (C100/C300/C400) series
+--@src/devices/cpu/clipper/clipper.h,CPUS["CLIPPER"] = true
+--------------------------------------------------
+
+if (CPUS["CLIPPER"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/cpu/clipper/clipper.cpp",
+ MAME_DIR .. "src/devices/cpu/clipper/clipper.h",
+ }
+end
+
+if (CPUS["CLIPPER"]~=null or _OPTIONS["with-tools"]) then
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/clipper/clipperd.cpp")
+end \ No newline at end of file
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua
index e102ba3cdcc..9c631aebbab 100644
--- a/scripts/src/lib.lua
+++ b/scripts/src/lib.lua
@@ -22,6 +22,7 @@ project "utils"
ext_includedir("expat"),
ext_includedir("zlib"),
ext_includedir("flac"),
+ ext_includedir("utf8proc"),
}
files {
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index ce9977d8dd6..9ca2bcaa196 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -221,6 +221,10 @@ function osdmodulesbuild()
defines {
"NO_USE_PORTAUDIO",
}
+ else
+ includedirs {
+ ext_includedir("portaudio"),
+ }
end
if _OPTIONS["NO_USE_MIDI"]=="1" then
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index af6ff1b98ce..5970f6d3334 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -113,7 +113,8 @@ function maintargetosdoptions(_target,_subtarget)
configuration { "mingw*" or "vs*" }
targetprefix "sdl"
links {
- "psapi"
+ "psapi",
+ "Ole32",
}
configuration { }
diff --git a/scripts/src/video.lua b/scripts/src/video.lua
index a5f12c2c565..ba52eb78bcd 100644
--- a/scripts/src/video.lua
+++ b/scripts/src/video.lua
@@ -390,6 +390,18 @@ end
--------------------------------------------------
--
+--@src/devices/video/huc6271.h,VIDEOS["HUC6271"] = true
+--------------------------------------------------
+
+if (VIDEOS["HUC6271"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/video/huc6271.cpp",
+ MAME_DIR .. "src/devices/video/huc6271.h",
+ }
+end
+
+--------------------------------------------------
+--
--@src/devices/video/huc6272.h,VIDEOS["HUC6272"] = true
--------------------------------------------------