summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/target
diff options
context:
space:
mode:
author Miodrag Milanović <mmicko@gmail.com>2015-06-07 06:20:28 +0200
committer Miodrag Milanović <mmicko@gmail.com>2015-06-07 06:20:28 +0200
commitcee210f47e9454ec2adadc5ab346e69661e38cff (patch)
treea1a5361a5da9d9f508276f39c6b75b19c3dbc9a9 /scripts/target
parent0cf27a8f7dd959e93daff61851166e9830b7195e (diff)
parent9027ce95756981dc2efa87a91049d5273ea34c8a (diff)
Merge pull request #203 from belegdol/master
Added the ability to use system flac, jpeg, lua, sqlite3, portmidi and zlib based on wallyweek's work This brings the system lib capabilities back to where they were prior to build system rewrite [Julian Sikorski]
Diffstat (limited to 'scripts/target')
-rw-r--r--scripts/target/ldplayer/ldplayer.lua10
-rw-r--r--scripts/target/mame/arcade.lua7
-rw-r--r--scripts/target/mame/dummy.lua10
-rw-r--r--scripts/target/mame/mess.lua6
-rw-r--r--scripts/target/mame/nl.lua9
-rw-r--r--scripts/target/mame/tiny.lua8
6 files changed, 38 insertions, 12 deletions
diff --git a/scripts/target/ldplayer/ldplayer.lua b/scripts/target/ldplayer/ldplayer.lua
index f12fad0c7db..c8435c4a8ab 100644
--- a/scripts/target/ldplayer/ldplayer.lua
+++ b/scripts/target/ldplayer/ldplayer.lua
@@ -68,9 +68,13 @@ function createProjects_ldplayer_ldplayer(_target, _subtarget)
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
- MAME_DIR .. "3rdparty/zlib",
GEN_DIR .. "mame/layout",
- }
+ }
+ if _OPTIONS["with-bundled-zlib"] then
+ includedirs {
+ MAME_DIR .. "3rdparty/zlib",
+ }
+ end
files{
MAME_DIR .. "src/emu/drivers/emudummy.c",
@@ -89,4 +93,4 @@ function linkProjects_ldplayer_ldplayer(_target, _subtarget)
links {
"drvldplayer",
}
-end \ No newline at end of file
+end
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 3b178ee8c15..7204ce91985 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -774,9 +774,14 @@ function createMAMEProjects(_target, _subtarget, _name)
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
- MAME_DIR .. "3rdparty/zlib",
GEN_DIR .. "mame/layout",
}
+
+ if _OPTIONS["with-bundled-zlib"] then
+ includedirs {
+ MAME_DIR .. "3rdparty/zlib",
+ }
+end
end
function createProjects_mame_arcade(_target, _subtarget)
diff --git a/scripts/target/mame/dummy.lua b/scripts/target/mame/dummy.lua
index 145862828d5..dba163b35f8 100644
--- a/scripts/target/mame/dummy.lua
+++ b/scripts/target/mame/dummy.lua
@@ -29,9 +29,13 @@ function createProjects_mame_dummy(_target, _subtarget)
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
- MAME_DIR .. "3rdparty/zlib",
GEN_DIR .. "mess/layout",
- }
+ }
+ if _OPTIONS["with-bundled-zlib"] then
+ includedirs {
+ MAME_DIR .. "3rdparty/zlib",
+ }
+ end
files{
MAME_DIR .. "src/mess/drivers/coleco.c",
@@ -43,4 +47,4 @@ function linkProjects_mame_dummy(_target, _subtarget)
links {
"mame_dummy",
}
-end \ No newline at end of file
+end
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 83525789969..8c709bbebad 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -874,11 +874,15 @@ function createMESSProjects(_target, _subtarget, _name)
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
- MAME_DIR .. "3rdparty/zlib",
GEN_DIR .. "mess/layout",
GEN_DIR .. "mame/layout",
MAME_DIR .. "src/emu/cpu/m68000",
}
+ if _OPTIONS["with-bundled-zlib"] then
+ includedirs {
+ MAME_DIR .. "3rdparty/zlib",
+ }
+ end
end
function createProjects_mame_mess(_target, _subtarget)
diff --git a/scripts/target/mame/nl.lua b/scripts/target/mame/nl.lua
index 2ed0cae3e19..0ba36789c5b 100644
--- a/scripts/target/mame/nl.lua
+++ b/scripts/target/mame/nl.lua
@@ -96,9 +96,14 @@ function createProjects_mame_nl(_target, _subtarget)
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
- MAME_DIR .. "3rdparty/zlib",
GEN_DIR .. "mame/layout",
- }
+ }
+
+ if _OPTIONS["with-bundled-zlib"] then
+ includedirs {
+ MAME_DIR .. "3rdparty/zlib",
+ }
+ end
files{
MAME_DIR .. "src/mame/drivers/pong.c",
diff --git a/scripts/target/mame/tiny.lua b/scripts/target/mame/tiny.lua
index 9dc18d31d9a..5594593d113 100644
--- a/scripts/target/mame/tiny.lua
+++ b/scripts/target/mame/tiny.lua
@@ -92,9 +92,13 @@ function createProjects_mame_tiny(_target, _subtarget)
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
- MAME_DIR .. "3rdparty/zlib",
GEN_DIR .. "mame/layout",
- }
+ }
+ if _OPTIONS["with-bundled-zlib"] then
+ includedirs {
+ MAME_DIR .. "3rdparty/zlib",
+ }
+ end
files{
MAME_DIR .. "src/mame/machine/ticket.c",