summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2015-07-13 09:12:44 -0400
committer R. Belmont <rb6502@users.noreply.github.com>2015-07-13 09:12:44 -0400
commite0eb69cac6c776bdb9a34dfe7618f2a0099cdefc (patch)
tree38d04b5460c283f97707e3ef98511f94604f6507 /scripts
parent7f6f8d0b8de01e1e034138093baf9b6dd4a52c78 (diff)
parent1b5d213aaa8235d520271fd0f5dd3f6be7434e3c (diff)
Merge pull request #240 from belegdol/master
Added ability to use system PortAudio
Diffstat (limited to 'scripts')
-rw-r--r--scripts/genie.lua5
-rw-r--r--scripts/src/3rdparty.lua6
2 files changed, 11 insertions, 0 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 150c6d73294..cfe0efeff9e 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -129,6 +129,11 @@ newoption {
}
newoption {
+ trigger = 'with-bundled-portaudio',
+ description = 'Build bundled PortAudio library',
+}
+
+newoption {
trigger = "distro",
description = "Choose distribution",
allowed = {
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index c2808c55dc5..889a6737cd5 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -650,6 +650,7 @@ end
-- PortAudio library objects
--------------------------------------------------
+if _OPTIONS["with-bundled-portaudio"] then
project "portaudio"
uuid "0755c5f5-eccf-47f3-98a9-df67018a94d4"
kind "StaticLib"
@@ -775,6 +776,11 @@ project "portaudio"
"-Wshadow"
}
end
+else
+links {
+ "portaudio",
+}
+end
--------------------------------------------------
-- UnitTest++ library objects