summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
author Ariane Fugmann <sailorsat@t-online.de>2016-06-06 19:19:22 +0200
committer Ariane Fugmann <sailorsat@t-online.de>2016-06-06 19:19:22 +0200
commit2293caeae45ee2816a3237b452d4e4927de5f29c (patch)
tree8eb36f8aa689796355f2608b0e162927da9dde16 /scripts/src
parent6ee9d158377f96a42c6b0f8967d9e7b1010b5b29 (diff)
parent6fbb28f063b358d62dd8822b548da604a3b95e25 (diff)
Merge remote-tracking branch 'refs/remotes/origin/master' into mamedev/master
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/bus.lua13
-rw-r--r--scripts/src/cpu.lua2
-rw-r--r--scripts/src/lib.lua2
-rw-r--r--scripts/src/osd/modules.lua2
-rw-r--r--scripts/src/osd/windows.lua32
5 files changed, 50 insertions, 1 deletions
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index eebdd5d8a1d..5b6cd19f659 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -576,6 +576,19 @@ end
---------------------------------------------------
--
+--@src/devices/bus/electron/exp.h,BUSES["ELECTRON"] = true
+---------------------------------------------------
+
+if (BUSES["ELECTRON"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/electron/exp.cpp",
+ MAME_DIR .. "src/devices/bus/electron/exp.h",
+ }
+end
+
+
+---------------------------------------------------
+--
--@src/devices/bus/ep64/exp.h,BUSES["EP64"] = true
---------------------------------------------------
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index 054a2bbabee..b06797009ea 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -1449,7 +1449,7 @@ end
--------------------------------------------------
-- PATINHO FEIO - Escola Politecnica - USP (Brazil)
---@src/devices/cpu/patinhofeio/patinho_feio.h,CPUS["PATINHOFEIO"] = true
+--@src/devices/cpu/patinhofeio/patinhofeio_cpu.h,CPUS["PATINHOFEIO"] = true
--------------------------------------------------
if (CPUS["PATINHOFEIO"]~=null) then
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua
index 080aa707153..77f6f4344dd 100644
--- a/scripts/src/lib.lua
+++ b/scripts/src/lib.lua
@@ -145,6 +145,8 @@ project "formats"
MAME_DIR .. "src/lib/formats/adam_cas.h",
MAME_DIR .. "src/lib/formats/adam_dsk.cpp",
MAME_DIR .. "src/lib/formats/adam_dsk.h",
+ MAME_DIR .. "src/lib/formats/afs_dsk.cpp",
+ MAME_DIR .. "src/lib/formats/afs_dsk.h",
MAME_DIR .. "src/lib/formats/ami_dsk.cpp",
MAME_DIR .. "src/lib/formats/ami_dsk.h",
MAME_DIR .. "src/lib/formats/ap2_dsk.cpp",
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index a05e55ee4c6..5fb1d23c1bc 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -96,6 +96,8 @@ function osdmodulesbuild()
MAME_DIR .. "src/osd/modules/output/none.cpp",
MAME_DIR .. "src/osd/modules/output/console.cpp",
MAME_DIR .. "src/osd/modules/output/network.cpp",
+ MAME_DIR .. "src/osd/modules/output/win32_output.cpp",
+ MAME_DIR .. "src/osd/modules/output/win32_output.h",
MAME_DIR .. "src/osd/modules/ipc/tcp_connection.cpp",
MAME_DIR .. "src/osd/modules/ipc/tcp_connection.h",
MAME_DIR .. "src/osd/modules/ipc/tcp_server.cpp",
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index b4be2dc7ce4..8b48b8f0771 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -259,3 +259,35 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/file/winsocket.cpp",
MAME_DIR .. "src/osd/modules/lib/osdlib_win32.cpp",
}
+
+
+
+--------------------------------------------------
+-- ledutil
+--------------------------------------------------
+
+if _OPTIONS["with-tools"] then
+ project("ledutil")
+ uuid ("061293ca-7290-44ac-b2b5-5913ae8dc9c0")
+ kind "ConsoleApp"
+
+ flags {
+ "Symbols", -- always include minimum symbols for executables
+ }
+
+ if _OPTIONS["SEPARATE_BIN"]~="1" then
+ targetdir(MAME_DIR)
+ end
+
+ links {
+ "ocore_" .. _OPTIONS["osd"],
+ }
+
+ includedirs {
+ MAME_DIR .. "src/osd",
+ }
+
+ files {
+ MAME_DIR .. "src/osd/windows/ledutil.cpp",
+ }
+end