remove 'location' calls from the contrib libraries, so they correctly follow the 'to' command line option.
This commit is contained in:
parent
8f0683d823
commit
2a6505d3f8
@ -5,21 +5,20 @@ project 'curl-lib'
|
||||
defines { 'BUILDING_LIBCURL', 'CURL_STATICLIB', 'HTTP_ONLY', 'CURL_DISABLE_LDAP' }
|
||||
flags { 'StaticRuntime' }
|
||||
warnings 'off'
|
||||
location "build"
|
||||
|
||||
files
|
||||
files
|
||||
{
|
||||
'**.h',
|
||||
'**.c'
|
||||
}
|
||||
|
||||
|
||||
configuration { 'windows' }
|
||||
defines { 'WIN32' }
|
||||
defines { 'USE_SCHANNEL', 'USE_WINDOWS_SSPI' }
|
||||
|
||||
configuration { 'linux' }
|
||||
defines { 'CURL_HIDDEN_SYMBOLS' }
|
||||
|
||||
|
||||
if os.findlib('ssl') then
|
||||
defines { 'USE_OPENSSL', 'USE_SSLEAY' }
|
||||
|
||||
@ -49,5 +48,5 @@ project 'curl-lib'
|
||||
flags { 'OptimizeSize' }
|
||||
|
||||
configuration { 'Debug' }
|
||||
defines { '_DEBUG' }
|
||||
flags { 'Symbols' }
|
||||
defines { '_DEBUG' }
|
||||
flags { 'Symbols' }
|
||||
|
@ -4,9 +4,8 @@ project "zip-lib"
|
||||
includedirs "include"
|
||||
defines {"N_FSEEKO", "_CRT_SECURE_NO_DEPRECATE"}
|
||||
flags { "StaticRuntime" }
|
||||
location "build"
|
||||
|
||||
files
|
||||
files
|
||||
{
|
||||
"**.h",
|
||||
"**.c"
|
||||
@ -26,5 +25,5 @@ project "zip-lib"
|
||||
flags { "OptimizeSize" }
|
||||
|
||||
configuration "Debug"
|
||||
defines {"_DEBUG"}
|
||||
flags { "Symbols" }
|
||||
defines {"_DEBUG"}
|
||||
flags { "Symbols" }
|
||||
|
@ -3,9 +3,8 @@ project "zlib-lib"
|
||||
kind "StaticLib"
|
||||
defines {"N_FSEEKO", "_CRT_SECURE_NO_DEPRECATE"}
|
||||
flags { "StaticRuntime" }
|
||||
location "build"
|
||||
|
||||
files
|
||||
files
|
||||
{
|
||||
"**.h",
|
||||
"**.c"
|
||||
|
Loading…
Reference in New Issue
Block a user