summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Julian Sikorski <belegdol+github@gmail.com>2018-02-10 22:58:29 +0100
committerGravatarGravatar hap <happppp@users.noreply.github.com>2018-02-10 22:58:29 +0100
commiteba66fbab834199b8e71ea0cf0f0f938748a336f (patch) (github)
treef921d817df8577526d2d0bf778f1620a6066d2b6
parent2b655f7c86a9e9b84757bf81ab31d907eda6823d (diff)
downloadmame-eba66fbab834199b8e71ea0cf0f0f938748a336f.tar.bz2
mame-eba66fbab834199b8e71ea0cf0f0f938748a336f.zip
Fix build failure with SOURCES defined (#3187)
* Fixed building using system utf8proc * Fixed building using system portaudio * Allow using system-wide asio headers (1.11.0 or higher required). * Allow using system-wide glm headers * Allow using system-wide rapidjson headers * Put all ext_includedir calls together * Fixed build failure when SOURCES is defined
-rw-r--r--scripts/build/makedep.py5
-rw-r--r--scripts/target/mame/arcade.lua12
2 files changed, 6 insertions, 11 deletions
diff --git a/scripts/build/makedep.py b/scripts/build/makedep.py
index cf4a97f1af0..9d8d4666910 100644
--- a/scripts/build/makedep.py
+++ b/scripts/build/makedep.py
@@ -240,8 +240,11 @@ if sys.argv[3]=='target':
sys.stdout.write(' MAME_DIR .. "src/lib/netlist",\n')
sys.stdout.write(' MAME_DIR .. "3rdparty",\n')
sys.stdout.write(' GEN_DIR .. "mame/layout",\n')
- sys.stdout.write(' ext_includedir("zlib"),\n')
sys.stdout.write(' ext_includedir("flac"),\n')
+ sys.stdout.write(' ext_includedir("glm"),\n')
+ sys.stdout.write(' ext_includedir("jpeg"),\n')
+ sys.stdout.write(' ext_includedir("rapidjson"),\n')
+ sys.stdout.write(' ext_includedir("zlib"),\n')
sys.stdout.write(' }\n')
sys.stdout.write('\n')
sys.stdout.write(' files{\n')
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index e477cc695be..00c6d07dd4e 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -861,6 +861,8 @@ function createMAMEProjects(_target, _subtarget, _name)
}
includedirs {
ext_includedir("flac"),
+ ext_includedir("glm"),
+ ext_includedir("jpeg"),
}
end
@@ -3156,11 +3158,6 @@ files {
}
createMAMEProjects(_target, _subtarget, "sega")
-
-includedirs {
- ext_includedir("glm"),
-}
-
files {
MAME_DIR .. "src/mame/drivers/angelkds.cpp",
MAME_DIR .. "src/mame/includes/angelkds.h",
@@ -4415,11 +4412,6 @@ files {
--------------------------------------------------
createMAMEProjects(_target, _subtarget, "misc")
-
-includedirs {
- ext_includedir("jpeg"),
-}
-
files {
MAME_DIR .. "src/mame/drivers/39in1.cpp",
MAME_DIR .. "src/mame/machine/pxa255.h",