summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-04-02 18:04:21 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2015-04-02 18:04:21 +0200
commit86e36b4912ec45f8148406e4346d995c9a2a9ff0 (patch)
treeb666d6a81f05bd804f36a7193718dba99027e57c
parent9d635321841f2c412efac5217bd1feea06d253f1 (diff)
removed includeosd (nw)
-rw-r--r--scripts/genie.lua6
-rw-r--r--scripts/src/3rdparty.lua9
-rw-r--r--scripts/src/emu.lua11
-rw-r--r--scripts/src/lib.lua6
-rw-r--r--scripts/src/main.lua3
-rw-r--r--scripts/src/osd/sdl.lua4
-rw-r--r--scripts/src/osd/windows.lua6
-rw-r--r--scripts/src/tools.lua45
-rw-r--r--scripts/target/ldplayer/ldplayer.lua3
-rw-r--r--scripts/target/mame/mame.lua3
-rw-r--r--scripts/target/mame/tiny.lua3
-rw-r--r--scripts/target/mess/mess.lua3
-rw-r--r--scripts/target/mess/tiny.lua3
13 files changed, 36 insertions, 69 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua
index cb1d5e6ad17..ebabf607326 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -38,12 +38,6 @@ function findfunction(x)
end
end
-function includeosd()
- includedirs {
- MAME_DIR .. "src/osd",
- }
-end
-
CPUS = {}
SOUNDS = {}
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index f1e48125e1a..66e98be2a5f 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -66,13 +66,13 @@ project "softfloat"
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
MAME_DIR .. "3rdparty/expat/lib/",
}
- includeosd()
files {
MAME_DIR .. "3rdparty/softfloat/softfloat.c",
@@ -389,12 +389,11 @@ project "portmidi"
kind "StaticLib"
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "3rdparty/portmidi/pm_common",
MAME_DIR .. "3rdparty/portmidi/porttime",
}
-
- includeosd()
-
+
configuration { "linux*" }
defines {
"PMALSA=1",
@@ -451,8 +450,6 @@ project "bgfx"
MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos",
}
- includeosd()
-
configuration { "vs*" }
includedirs {
MAME_DIR .. "3rdparty/dxsdk/Include",
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua
index 192dd0cd1b5..687275c0069 100644
--- a/scripts/src/emu.lua
+++ b/scripts/src/emu.lua
@@ -6,6 +6,7 @@ options {
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
@@ -17,8 +18,6 @@ includedirs {
GEN_DIR .. "emu/layout",
}
-includeosd()
-
files {
MAME_DIR .. "src/emu/hashfile.c",
MAME_DIR .. "src/emu/addrmap.c",
@@ -174,6 +173,7 @@ function emuProject(_target, _subtarget)
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
MAME_DIR .. "src/mame", -- used for sound amiga
MAME_DIR .. "src/lib",
@@ -187,7 +187,6 @@ function emuProject(_target, _subtarget)
MAME_DIR .. "src/emu/cpu/m68000",
GEN_DIR .. "emu/cpu/m68000",
}
- includeosd()
dofile(path.join("src", "cpu.lua"))
@@ -210,6 +209,7 @@ function emuProject(_target, _subtarget)
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
@@ -223,8 +223,6 @@ function emuProject(_target, _subtarget)
GEN_DIR .. "emu/layout",
}
- includeosd()
-
dofile(path.join("src", "bus.lua"))
@@ -237,6 +235,7 @@ function emuProject(_target, _subtarget)
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
@@ -247,8 +246,6 @@ function emuProject(_target, _subtarget)
GEN_DIR .. "emu",
}
- includeosd()
-
files {
disasm_files
}
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua
index aa49783b82c..a0a2471cf1a 100644
--- a/scripts/src/lib.lua
+++ b/scripts/src/lib.lua
@@ -7,14 +7,13 @@ project "utils"
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
MAME_DIR .. "3rdparty/expat/lib",
MAME_DIR .. "3rdparty/zlib",
}
- includeosd()
-
files {
MAME_DIR .. "src/lib/util/astring.c",
MAME_DIR .. "src/lib/util/avhuff.c",
@@ -63,6 +62,7 @@ project "formats"
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
@@ -70,8 +70,6 @@ project "formats"
MAME_DIR .. "3rdparty/zlib",
}
- includeosd()
-
files {
MAME_DIR .. "src/lib/formats/cassimg.c",
MAME_DIR .. "src/lib/formats/flopimg.c",
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index a7ba39c3539..70da96afe00 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -68,6 +68,7 @@ function mainProject(_target, _subtarget)
maintargetosdoptions(_target)
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
MAME_DIR .. "src/" .. _target,
MAME_DIR .. "src/lib",
@@ -78,8 +79,6 @@ function mainProject(_target, _subtarget)
GEN_DIR .. "resource",
}
- includeosd()
-
if _OPTIONS["targetos"]=="macosx" then
linkoptions {
"-sectcreate __TEXT __info_plist " .. GEN_DIR .. "/resource/" .. _OPTIONS["target"] .. "-Info.plist"
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 3ba6297a6ad..7a2c24c014a 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -426,8 +426,10 @@ if _OPTIONS["with-tools"] then
dofile("sdl_cfg.lua")
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
}
+
targetdir(MAME_DIR)
links {
@@ -435,8 +437,6 @@ if _OPTIONS["with-tools"] then
"ocore_" .. _OPTIONS["osd"],
}
- includeosd()
-
files {
MAME_DIR .. "src/osd/sdl/testkeys.c",
}
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index f372375b598..fcedd0c6710 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -187,8 +187,10 @@ if _OPTIONS["with-tools"] then
"ocore_" .. _OPTIONS["osd"],
}
- includeosd()
-
+ includedirs {
+ MAME_DIR .. "src/osd",
+ }
+
files {
MAME_DIR .. "src/osd/windows/ledutil.c",
}
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index 10cb2ea8432..aaa3c780b08 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -21,11 +21,10 @@ links {
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
}
-includeosd()
-
files {
MAME_DIR .. "src/tools/romcmp.c",
}
@@ -55,12 +54,11 @@ links {
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
}
-includeosd()
-
files {
MAME_DIR .. "src/tools/chdman.c",
MAME_DIR .. "src/version.c",
@@ -89,11 +87,10 @@ links {
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
}
-includeosd()
-
files {
MAME_DIR .. "src/tools/jedutil.c",
}
@@ -125,13 +122,12 @@ links {
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
}
-includeosd()
-
files {
MAME_DIR .. "src/tools/unidasm.c",
}
@@ -162,12 +158,11 @@ links {
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
}
-includeosd()
-
files {
MAME_DIR .. "src/tools/ldresample.c",
}
@@ -197,12 +192,11 @@ links {
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
}
-includeosd()
-
files {
MAME_DIR .. "src/tools/ldverify.c",
}
@@ -230,11 +224,10 @@ links {
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
}
-includeosd()
-
files {
MAME_DIR .. "src/tools/regrep.c",
}
@@ -262,11 +255,10 @@ links {
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
}
-includeosd()
-
files {
MAME_DIR .. "src/tools/srcclean.c",
}
@@ -294,11 +286,10 @@ links {
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
}
-includeosd()
-
files {
MAME_DIR .. "src/tools/src2html.c",
}
@@ -328,11 +319,10 @@ links {
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
}
-includeosd()
-
files {
MAME_DIR .. "src/tools/split.c",
}
@@ -360,11 +350,10 @@ links {
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
}
-includeosd()
-
files {
MAME_DIR .. "src/tools/pngcmp.c",
}
@@ -394,12 +383,11 @@ links {
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "src/emu",
}
-includeosd()
-
files {
MAME_DIR .. "src/tools/nltool.c",
}
@@ -432,12 +420,11 @@ links {
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
}
-includeosd()
-
files {
MAME_DIR .. "src/mess/tools/castool/main.c",
}
@@ -469,12 +456,11 @@ links {
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
}
-includeosd()
-
files {
MAME_DIR .. "src/mess/tools/floptool/main.c",
}
@@ -506,14 +492,13 @@ links {
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty/zlib",
MAME_DIR .. "src/mess/tools/imgtool",
}
-includeosd()
-
files {
MAME_DIR .. "src/mess/tools/imgtool/main.c",
MAME_DIR .. "src/mess/tools/imgtool/stream.c",
diff --git a/scripts/target/ldplayer/ldplayer.lua b/scripts/target/ldplayer/ldplayer.lua
index 619f673eb84..ab3d4280de1 100644
--- a/scripts/target/ldplayer/ldplayer.lua
+++ b/scripts/target/ldplayer/ldplayer.lua
@@ -62,6 +62,7 @@ function createProjects_ldplayer_ldplayer(_target, _subtarget)
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
MAME_DIR .. "src/mame",
MAME_DIR .. "src/lib",
@@ -71,8 +72,6 @@ function createProjects_ldplayer_ldplayer(_target, _subtarget)
GEN_DIR .. "mame/layout",
}
- includeosd()
-
files{
MAME_DIR .. "src/emu/drivers/emudummy.c",
}
diff --git a/scripts/target/mame/mame.lua b/scripts/target/mame/mame.lua
index aaa698eda48..09361d7902b 100644
--- a/scripts/target/mame/mame.lua
+++ b/scripts/target/mame/mame.lua
@@ -764,6 +764,7 @@ function createMAMEProjects(_target, _subtarget, _name)
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
MAME_DIR .. "src/mame",
MAME_DIR .. "src/lib",
@@ -772,8 +773,6 @@ function createMAMEProjects(_target, _subtarget, _name)
MAME_DIR .. "3rdparty/zlib",
GEN_DIR .. "mame/layout",
}
-
- includeosd()
end
function createProjects_mame_mame(_target, _subtarget)
diff --git a/scripts/target/mame/tiny.lua b/scripts/target/mame/tiny.lua
index def57c00324..aad7d188dba 100644
--- a/scripts/target/mame/tiny.lua
+++ b/scripts/target/mame/tiny.lua
@@ -86,6 +86,7 @@ function createProjects_mame_tiny(_target, _subtarget)
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
MAME_DIR .. "src/mame",
MAME_DIR .. "src/lib",
@@ -95,8 +96,6 @@ function createProjects_mame_tiny(_target, _subtarget)
GEN_DIR .. "mame/layout",
}
- includeosd()
-
files{
MAME_DIR .. "src/mame/machine/ticket.c",
MAME_DIR .. "src/mame/drivers/carpolo.c",
diff --git a/scripts/target/mess/mess.lua b/scripts/target/mess/mess.lua
index 3446f13b47b..1901a3ff30d 100644
--- a/scripts/target/mess/mess.lua
+++ b/scripts/target/mess/mess.lua
@@ -856,6 +856,7 @@ function createMESSProjects(_target, _subtarget, _name)
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
MAME_DIR .. "src/mess",
MAME_DIR .. "src/mame",
@@ -867,8 +868,6 @@ function createMESSProjects(_target, _subtarget, _name)
GEN_DIR .. "mame/layout",
GEN_DIR .. "emu/cpu/m68000",
}
-
- includeosd()
end
function createProjects_mess_mess(_target, _subtarget)
diff --git a/scripts/target/mess/tiny.lua b/scripts/target/mess/tiny.lua
index 8db43cbec27..4e18931c083 100644
--- a/scripts/target/mess/tiny.lua
+++ b/scripts/target/mess/tiny.lua
@@ -17,6 +17,7 @@ function createProjects_mess_tiny(_target, _subtarget)
}
includedirs {
+ MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
MAME_DIR .. "src/mess",
MAME_DIR .. "src/lib",
@@ -26,8 +27,6 @@ function createProjects_mess_tiny(_target, _subtarget)
GEN_DIR .. "mess/layout",
}
- includeosd()
-
files{
MAME_DIR .. "src/mess/drivers/coleco.c",
MAME_DIR .. "src/mess/machine/coleco.c",