diff options
author | 2016-03-28 12:09:19 -0500 | |
---|---|---|
committer | 2016-03-28 22:26:52 -0500 | |
commit | 9d9c8fad6a0e5ff433fd6a97b4921af10e074f96 (patch) | |
tree | a7382cf895f9dd372061d8bf3094ed59046fe1ce /scripts/genie.lua | |
parent | 6cb951b7c42d87e4b52604ecbd5317b6fc8f9665 (diff) |
Extend system library support (nw)
Extend USE_SYSTEM_LIB_* to support providing the library name and include directory.
To link against system specific lib names and header path: (ref #711)
USE_SYSTEM_LIB_LUA=lua5.3:/usr/include/lua5.3
Diffstat (limited to 'scripts/genie.lua')
-rw-r--r-- | scripts/genie.lua | 55 |
1 files changed, 6 insertions, 49 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua index 219b493f135..645bf99ed8f 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -120,56 +120,11 @@ newoption { } newoption { - trigger = 'with-bundled-expat', - description = 'Build bundled Expat library', -} - -newoption { - trigger = 'with-bundled-zlib', - description = 'Build bundled Zlib library', -} - -newoption { - trigger = 'with-bundled-jpeg', - description = 'Build bundled JPEG library', -} - -newoption { - trigger = 'with-bundled-flac', - description = 'Build bundled FLAC library', -} - -newoption { - trigger = 'with-bundled-lua', - description = 'Build bundled LUA library', -} - -newoption { - trigger = 'with-bundled-sqlite3', - description = 'Build bundled SQLite library', -} - -newoption { - trigger = 'with-bundled-portmidi', - description = 'Build bundled PortMidi library', -} - -newoption { - trigger = 'with-bundled-portaudio', - description = 'Build bundled PortAudio library', -} - -newoption { trigger = 'with-bundled-sdl2', description = 'Build bundled SDL2 library', } newoption { - trigger = 'with-bundled-libuv', - description = 'Build bundled libuv library', -} - -newoption { trigger = "distro", description = "Choose distribution", allowed = { @@ -411,6 +366,8 @@ newoption { } } +dofile("extlib.lua") + if _OPTIONS["SHLIB"]=="1" then LIBTYPE = "SharedLib" else @@ -666,25 +623,25 @@ else end -- need to ensure FLAC functions are statically linked -if _OPTIONS["with-bundled-flac"] then +if not _OPTIONS["with-system-flac"] then defines { "FLAC__NO_DLL", } end -if not _OPTIONS["with-bundled-jpeg"] then +if _OPTIONS["with-system-jpeg"] then defines { "USE_SYSTEM_JPEGLIB", } end -if not _OPTIONS["with-bundled-portmidi"] then +if _OPTIONS["with-system-portmidi"] then defines { "USE_SYSTEM_PORTMIDI", } end -if not _OPTIONS["with-bundled-sqlite3"] then +if _OPTIONS["with-system-sqlite3"] then defines { "USE_SYSTEM_SQLITE", } |