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
This commit is contained in:
Julian Sikorski 2018-02-10 22:58:29 +01:00 committed by hap
parent 2b655f7c86
commit eba66fbab8
2 changed files with 6 additions and 11 deletions

View File

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

View File

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