From c3397ae4a9ad9517f2f4818f4223a338398a92bc Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Tue, 29 Mar 2016 00:45:53 -0700 Subject: [PATCH] fix include dirs (nw) --- scripts/extlib.lua | 2 +- scripts/src/emu.lua | 1 + scripts/src/lib.lua | 1 + scripts/src/osd/modules.lua | 4 ++++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/extlib.lua b/scripts/extlib.lua index 0ed3415377d..bd80c8b74b8 100644 --- a/scripts/extlib.lua +++ b/scripts/extlib.lua @@ -9,7 +9,7 @@ local extlibs = { expat = { "expat", "3rdparty/expat/lib" }, zlib = { "z", "3rdparty/zlib" }, jpeg = { "jpeg", "3rdparty/libjpeg" }, - flac = { "FLAC", "3rdparty/libflac/include/FLAC" }, + flac = { "FLAC", "3rdparty/libflac/include" }, sqlite3 = { "sqlite3", "3rdparty/sqlite3" }, portmidi = { "portmidi", "3rdparty/portmidi/pm_common" }, portaudio = { "portaudio", "3rdparty/portaudio/include" }, diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index 7e39c71e357..56ff55879dd 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -34,6 +34,7 @@ includedirs { includedirs { ext_includedir("expat"), ext_includedir("lua"), + ext_includedir("flac"), } if (_OPTIONS["targetos"] == "windows" and _OPTIONS["osd"] ~= "osdmini") then diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua index 18d6563edfa..c43bbecb291 100644 --- a/scripts/src/lib.lua +++ b/scripts/src/lib.lua @@ -21,6 +21,7 @@ project "utils" MAME_DIR .. "3rdparty", ext_includedir("expat"), ext_includedir("zlib"), + ext_includedir("flac"), } files { diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index 5ea9bec2f1c..a8b8debe272 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -178,6 +178,10 @@ function osdmodulesbuild() defines { "NO_USE_MIDI", } + else + includedirs { + ext_includedir("portmidi"), + } end if _OPTIONS["USE_QTDEBUG"]=="1" then