inverted 3rd party contrib lib defaults and options
This commit is contained in:
parent
b5677f58d7
commit
9c3b435d15
24
premake5.lua
24
premake5.lua
@ -63,14 +63,14 @@
|
|||||||
|
|
||||||
|
|
||||||
newoption {
|
newoption {
|
||||||
trigger = "withcurl",
|
trigger = "no-curl",
|
||||||
description = "Enable Curl 3rd party lib"
|
description = "Disable Curl 3rd party lib"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
newoption {
|
newoption {
|
||||||
trigger = "withzip",
|
trigger = "no-zlib",
|
||||||
description = "Enable Zlib/Zip 3rd party lib"
|
description = "Disable Zlib/Zip 3rd party lib"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -95,12 +95,12 @@
|
|||||||
includedirs { "src/host/lua-5.1.4/src" }
|
includedirs { "src/host/lua-5.1.4/src" }
|
||||||
|
|
||||||
-- optional 3rd party libraries
|
-- optional 3rd party libraries
|
||||||
if _OPTIONS.withzip then
|
if not _OPTIONS["no-zlib"] then
|
||||||
includedirs { "contrib/zlib", "contrib/libzip" }
|
includedirs { "contrib/zlib", "contrib/libzip" }
|
||||||
defines { "PREMAKE_COMPRESSION" }
|
defines { "PREMAKE_COMPRESSION" }
|
||||||
links { "zip-lib", "zlib-lib" }
|
links { "zip-lib", "zlib-lib" }
|
||||||
end
|
end
|
||||||
if _OPTIONS.withcurl then
|
if not _OPTIONS["no-curl"] then
|
||||||
includedirs { "contrib/curl/include" }
|
includedirs { "contrib/curl/include" }
|
||||||
defines { "CURL_STATICLIB", "PREMAKE_CURL" }
|
defines { "CURL_STATICLIB", "PREMAKE_CURL" }
|
||||||
links { "curl-lib" }
|
links { "curl-lib" }
|
||||||
@ -169,13 +169,13 @@
|
|||||||
links { "m" }
|
links { "m" }
|
||||||
|
|
||||||
-- optional 3rd party libraries
|
-- optional 3rd party libraries
|
||||||
group 'contrib'
|
group "contrib"
|
||||||
if _OPTIONS.withzip then
|
if not _OPTIONS["no-zlib"] then
|
||||||
include 'contrib/zlib'
|
include "contrib/zlib"
|
||||||
include 'contrib/libzip'
|
include "contrib/libzip"
|
||||||
end
|
end
|
||||||
if _OPTIONS.withcurl then
|
if not _OPTIONS["no-curl"] then
|
||||||
include 'contrib/curl'
|
include "contrib/curl"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user