diff options
author | 2015-06-07 06:20:28 +0200 | |
---|---|---|
committer | 2015-06-07 06:20:28 +0200 | |
commit | cee210f47e9454ec2adadc5ab346e69661e38cff (patch) | |
tree | a1a5361a5da9d9f508276f39c6b75b19c3dbc9a9 /scripts/genie.lua | |
parent | 0cf27a8f7dd959e93daff61851166e9830b7195e (diff) | |
parent | 9027ce95756981dc2efa87a91049d5273ea34c8a (diff) |
Merge pull request #203 from belegdol/master
Added the ability to use system flac, jpeg, lua, sqlite3, portmidi and zlib based on wallyweek's work
This brings the system lib capabilities back to where they were prior to build system rewrite [Julian Sikorski]
Diffstat (limited to 'scripts/genie.lua')
-rw-r--r-- | scripts/genie.lua | 56 |
1 files changed, 53 insertions, 3 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua index 702ae917064..7a591db050b 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -99,6 +99,36 @@ newoption { } 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 = "distro", description = "Choose distribution", allowed = { @@ -596,9 +626,29 @@ else end -- need to ensure FLAC functions are statically linked -defines { - "FLAC__NO_DLL", -} +if _OPTIONS["with-bundled-flac"] then + defines { + "FLAC__NO_DLL", + } + end + +if not _OPTIONS["with-bundled-jpeg"] then + defines { + "USE_SYSTEM_JPEGLIB", + } + end + +if not _OPTIONS["with-bundled-portmidi"] then + defines { + "USE_SYSTEM_PORTMIDI", + } + end + +if not _OPTIONS["with-bundled-sqlite3"] then + defines { + "USE_SYSTEM_SQLITE", + } + end if _OPTIONS["NOASM"]=="1" then defines { |