removed includeosd (nw)

This commit is contained in:
Miodrag Milanovic 2015-04-02 18:04:21 +02:00
parent 9d63532184
commit 86e36b4912
13 changed files with 36 additions and 69 deletions

View File

@ -38,12 +38,6 @@ function findfunction(x)
end
end
function includeosd()
includedirs {
MAME_DIR .. "src/osd",
}
end
CPUS = {}
SOUNDS = {}

View File

@ -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",

View File

@ -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
}

View File

@ -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",

View File

@ -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"

View File

@ -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",
}

View File

@ -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",
}

View File

@ -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",

View File

@ -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",
}

View File

@ -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)

View File

@ -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",

View File

@ -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)

View File

@ -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",