summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
author motoschifo <motoschifo@users.noreply.github.com>2016-02-09 19:12:04 +0100
committer motoschifo <motoschifo@users.noreply.github.com>2016-02-09 19:12:04 +0100
commit8b880ab07f43c80461e9645628da36929076c4d0 (patch)
tree732b0a3bfad727677fbf1d8ff5ccb2cdc7cd939c /scripts/src
parentf736cd5abcea21c8b2c8c4f2d2909952856ac22d (diff)
parent8e30db1e7441983971abaf8fa8c04a8c5475c6b0 (diff)
Merge pull request #2 from mamedev/master
Update to master
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/bus.lua14
-rw-r--r--scripts/src/osd/sdl_cfg.lua18
-rw-r--r--scripts/src/video.lua12
3 files changed, 44 insertions, 0 deletions
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index bafa63a269d..9514e9f5a74 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -2558,3 +2558,17 @@ if (BUSES["CGENIE_PARALLEL"]~=null) then
MAME_DIR .. "src/devices/bus/cgenie/parallel/printer.h",
}
end
+
+---------------------------------------------------
+--
+--@src/devices/bus/m5/slot.h,BUSES["M5"] = true
+---------------------------------------------------
+if (BUSES["M5"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/m5/slot.cpp",
+ MAME_DIR .. "src/devices/bus/m5/slot.h",
+ MAME_DIR .. "src/devices/bus/m5/rom.cpp",
+ MAME_DIR .. "src/devices/bus/m5/rom.h",
+ }
+end
+
diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua
index 2dc1a7e465a..dd902d1fe60 100644
--- a/scripts/src/osd/sdl_cfg.lua
+++ b/scripts/src/osd/sdl_cfg.lua
@@ -151,3 +151,21 @@ elseif _OPTIONS["targetos"]=="os2" then
backtick(sdlconfigcmd() .. " --cflags"),
}
end
+
+configuration { "osx*" }
+ includedirs {
+ MAME_DIR .. "3rdparty/bx/include/compat/osx",
+ }
+
+configuration { "freebsd" }
+ includedirs {
+ MAME_DIR .. "3rdparty/bx/include/compat/freebsd",
+ }
+
+configuration { "netbsd" }
+ includedirs {
+ MAME_DIR .. "3rdparty/bx/include/compat/freebsd",
+ }
+
+configuration { }
+
diff --git a/scripts/src/video.lua b/scripts/src/video.lua
index fafc07e37f6..96a310f154b 100644
--- a/scripts/src/video.lua
+++ b/scripts/src/video.lua
@@ -842,3 +842,15 @@ if (VIDEOS["CRTC_EGA"]~=null) then
MAME_DIR .. "src/devices/video/crtc_ega.h",
}
end
+
+--------------------------------------------------
+--
+--@src/devices/video/jangou_blitter.h,VIDEOS["JANGOU_BLITTER"] = true
+--------------------------------------------------
+
+if (VIDEOS["JANGOU_BLITTER"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/video/jangou_blitter.cpp",
+ MAME_DIR .. "src/devices/video/jangou_blitter.h",
+ }
+end