jackcartersmith/gse
1
0
Fork 0
Code Issues Pull Requests Actions Releases Activity

remove this linker flags hack for now

Browse Source
This commit is contained in:
otavepto 2024-05-28 22:21:40 +03:00
parent a6c53a2c6d
commit 9aed66e9f3
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
premake5-deps.lua
View File

@ -541,18 +541,10 @@ if _OPTIONS["build-curl"] or _OPTIONS["all-build"] then
end end
if _OPTIONS["32-build"] then if _OPTIONS["32-build"] then
cmake_build('curl', true, merge_list(merge_list(curl_common_defs, wild_zlib_32), { cmake_build('curl', true, merge_list(curl_common_defs, wild_zlib_32))
'CMAKE_SHARED_LINKER_FLAGS_INIT="' .. wild_zlib_path_32 .. '"',
'CMAKE_MODULE_LINKER_FLAGS_INIT="' .. wild_zlib_path_32 .. '"',
'CMAKE_EXE_LINKER_FLAGS_INIT="' .. wild_zlib_path_32 .. '"',
}))
end end
if _OPTIONS["64-build"] then if _OPTIONS["64-build"] then
cmake_build('curl', false, merge_list(merge_list(curl_common_defs, wild_zlib_64), { cmake_build('curl', false, merge_list(curl_common_defs, wild_zlib_64))
'CMAKE_SHARED_LINKER_FLAGS_INIT="' .. wild_zlib_path_64 .. '"',
'CMAKE_MODULE_LINKER_FLAGS_INIT="' .. wild_zlib_path_64 .. '"',
'CMAKE_EXE_LINKER_FLAGS_INIT="' .. wild_zlib_path_64 .. '"',
}))
end end
end end
@ -563,18 +555,10 @@ if _OPTIONS["build-protobuf"] or _OPTIONS["all-build"] then
"protobuf_WITH_ZLIB=ON", "protobuf_WITH_ZLIB=ON",
} }
if _OPTIONS["32-build"] then if _OPTIONS["32-build"] then
cmake_build('protobuf', true, merge_list(merge_list(proto_common_defs, wild_zlib_32), { cmake_build('protobuf', true, merge_list(proto_common_defs, wild_zlib_32))
'CMAKE_SHARED_LINKER_FLAGS_INIT="' .. wild_zlib_path_32 .. '"',
'CMAKE_MODULE_LINKER_FLAGS_INIT="' .. wild_zlib_path_32 .. '"',
'CMAKE_EXE_LINKER_FLAGS_INIT="' .. wild_zlib_path_32 .. '"',
}))
end end
if _OPTIONS["64-build"] then if _OPTIONS["64-build"] then
cmake_build('protobuf', false, merge_list(merge_list(proto_common_defs, wild_zlib_64), { cmake_build('protobuf', false, merge_list(proto_common_defs, wild_zlib_64))
'CMAKE_SHARED_LINKER_FLAGS_INIT="' .. wild_zlib_path_64 .. '"',
'CMAKE_MODULE_LINKER_FLAGS_INIT="' .. wild_zlib_path_64 .. '"',
'CMAKE_EXE_LINKER_FLAGS_INIT="' .. wild_zlib_path_64 .. '"',
}))
end end
end end