summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src/tools.lua
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2015-07-20 08:11:41 +0200
committer ImJezze <jezze@gmx.net>2015-07-20 08:11:41 +0200
commit4bcb0c13f50ddb1cd3fd0341b4bb31d9c3c7fc7a (patch)
tree55eccacfca0e69435d0d4e6615205310ca11f271 /scripts/src/tools.lua
parentd132946c6f45aa8d271c6180e86f72dd08243048 (diff)
parent229785f695b26c702c8490792611f59d0366a933 (diff)
Merge pull request #5 from mamedev/master
Sync to base master
Diffstat (limited to 'scripts/src/tools.lua')
-rw-r--r--scripts/src/tools.lua271
1 files changed, 245 insertions, 26 deletions
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index 936afb54346..55f966eed2e 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -24,10 +24,19 @@ end
links {
"utils",
"expat",
- "zlib",
"ocore_" .. _OPTIONS["osd"],
}
+if _OPTIONS["with-bundled-zlib"] then
+ links {
+ "zlib",
+ }
+else
+ links {
+ "z",
+ }
+end
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -60,12 +69,30 @@ end
links {
"utils",
"expat",
- "zlib",
- "flac",
"7z",
"ocore_" .. _OPTIONS["osd"],
}
+if _OPTIONS["with-bundled-zlib"] then
+ links {
+ "zlib",
+ }
+else
+ links {
+ "z",
+ }
+end
+
+if _OPTIONS["with-bundled-flac"] then
+ links {
+ "flac",
+ }
+else
+ links {
+ "FLAC",
+ }
+end
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -100,10 +127,19 @@ end
links {
"utils",
"expat",
- "zlib",
"ocore_" .. _OPTIONS["osd"],
}
+if _OPTIONS["with-bundled-zlib"] then
+ links {
+ "zlib",
+ }
+else
+ links {
+ "z",
+ }
+end
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -138,12 +174,30 @@ links {
"emu",
"utils",
"expat",
- "zlib",
- "flac",
"7z",
"ocore_" .. _OPTIONS["osd"],
}
+if _OPTIONS["with-bundled-zlib"] then
+ links {
+ "zlib",
+ }
+else
+ links {
+ "z",
+ }
+end
+
+if _OPTIONS["with-bundled-flac"] then
+ links {
+ "flac",
+ }
+else
+ links {
+ "FLAC",
+ }
+end
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
@@ -179,12 +233,30 @@ end
links {
"utils",
"expat",
- "zlib",
- "flac",
"7z",
"ocore_" .. _OPTIONS["osd"],
}
+if _OPTIONS["with-bundled-zlib"] then
+ links {
+ "zlib",
+ }
+else
+ links {
+ "z",
+ }
+end
+
+if _OPTIONS["with-bundled-flac"] then
+ links {
+ "flac",
+ }
+else
+ links {
+ "FLAC",
+ }
+end
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -218,12 +290,30 @@ end
links {
"utils",
"expat",
- "zlib",
- "flac",
"7z",
"ocore_" .. _OPTIONS["osd"],
}
+if _OPTIONS["with-bundled-zlib"] then
+ links {
+ "zlib",
+ }
+else
+ links {
+ "z",
+ }
+end
+
+if _OPTIONS["with-bundled-flac"] then
+ links {
+ "flac",
+ }
+else
+ links {
+ "FLAC",
+ }
+end
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -257,10 +347,19 @@ end
links {
"utils",
"expat",
- "zlib",
"ocore_" .. _OPTIONS["osd"],
}
+if _OPTIONS["with-bundled-zlib"] then
+ links {
+ "zlib",
+ }
+else
+ links {
+ "z",
+ }
+end
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -293,10 +392,19 @@ end
links {
"utils",
"expat",
- "zlib",
"ocore_" .. _OPTIONS["osd"],
}
+if _OPTIONS["with-bundled-zlib"] then
+ links {
+ "zlib",
+ }
+else
+ links {
+ "z",
+ }
+end
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -329,10 +437,19 @@ end
links {
"utils",
"expat",
- "zlib",
"ocore_" .. _OPTIONS["osd"],
}
+if _OPTIONS["with-bundled-zlib"] then
+ links {
+ "zlib",
+ }
+else
+ links {
+ "z",
+ }
+end
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -365,12 +482,30 @@ end
links {
"utils",
"expat",
- "zlib",
- "flac",
"7z",
"ocore_" .. _OPTIONS["osd"],
}
+if _OPTIONS["with-bundled-zlib"] then
+ links {
+ "zlib",
+ }
+else
+ links {
+ "z",
+ }
+end
+
+if _OPTIONS["with-bundled-flac"] then
+ links {
+ "flac",
+ }
+else
+ links {
+ "FLAC",
+ }
+end
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -403,10 +538,19 @@ end
links {
"utils",
"expat",
- "zlib",
"ocore_" .. _OPTIONS["osd"],
}
+if _OPTIONS["with-bundled-zlib"] then
+ links {
+ "zlib",
+ }
+else
+ links {
+ "z",
+ }
+end
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -439,12 +583,31 @@ end
links {
"utils",
"expat",
- "zlib",
- "flac",
"7z",
"ocore_" .. _OPTIONS["osd"],
+ "netlist",
}
+if _OPTIONS["with-bundled-zlib"] then
+ links {
+ "zlib",
+ }
+else
+ links {
+ "z",
+ }
+end
+
+if _OPTIONS["with-bundled-flac"] then
+ links {
+ "flac",
+ }
+else
+ links {
+ "FLAC",
+ }
+end
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -455,8 +618,6 @@ files {
MAME_DIR .. "src/tools/nltool.c",
}
-dofile("netlist.lua")
-
--------------------------------------------------
-- castool
--------------------------------------------------
@@ -481,12 +642,30 @@ links {
"formats",
"utils",
"expat",
- "zlib",
- "flac",
"7z",
"ocore_" .. _OPTIONS["osd"],
}
+if _OPTIONS["with-bundled-zlib"] then
+ links {
+ "zlib",
+ }
+else
+ links {
+ "z",
+ }
+end
+
+if _OPTIONS["with-bundled-flac"] then
+ links {
+ "flac",
+ }
+else
+ links {
+ "FLAC",
+ }
+end
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib",
@@ -522,12 +701,30 @@ links {
"emu",
"utils",
"expat",
- "zlib",
- "flac",
"7z",
"ocore_" .. _OPTIONS["osd"],
}
+if _OPTIONS["with-bundled-zlib"] then
+ links {
+ "zlib",
+ }
+else
+ links {
+ "z",
+ }
+end
+
+if _OPTIONS["with-bundled-flac"] then
+ links {
+ "flac",
+ }
+else
+ links {
+ "FLAC",
+ }
+end
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib",
@@ -563,12 +760,30 @@ links {
"emu",
"utils",
"expat",
- "zlib",
- "flac",
"7z",
"ocore_" .. _OPTIONS["osd"],
}
+if _OPTIONS["with-bundled-zlib"] then
+ links {
+ "zlib",
+ }
+else
+ links {
+ "z",
+ }
+end
+
+if _OPTIONS["with-bundled-flac"] then
+ links {
+ "flac",
+ }
+else
+ links {
+ "FLAC",
+ }
+end
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib",
@@ -590,6 +805,10 @@ files {
MAME_DIR .. "src/mess/tools/imgtool/imgterrs.c",
MAME_DIR .. "src/mess/tools/imgtool/imghd.c",
MAME_DIR .. "src/mess/tools/imgtool/charconv.c",
+ MAME_DIR .. "src/mess/tools/imgtool/formats/vt_dsk.c",
+ MAME_DIR .. "src/mess/tools/imgtool/formats/vt_dsk.h",
+ MAME_DIR .. "src/mess/tools/imgtool/formats/coco_dsk.c",
+ MAME_DIR .. "src/mess/tools/imgtool/formats/coco_dsk.h",
MAME_DIR .. "src/mess/tools/imgtool/modules/amiga.c",
MAME_DIR .. "src/mess/tools/imgtool/modules/macbin.c",
MAME_DIR .. "src/mess/tools/imgtool/modules/rsdos.c",