From 9aed66e9f39c160b1f9695d93439fdb63fde3eba Mon Sep 17 00:00:00 2001 From: otavepto <153766569+otavepto@users.noreply.github.com> Date: Tue, 28 May 2024 22:21:40 +0300 Subject: [PATCH] remove this linker flags hack for now --- premake5-deps.lua | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/premake5-deps.lua b/premake5-deps.lua index d008c56d..5e4df5c7 100644 --- a/premake5-deps.lua +++ b/premake5-deps.lua @@ -541,18 +541,10 @@ if _OPTIONS["build-curl"] or _OPTIONS["all-build"] then end if _OPTIONS["32-build"] then - cmake_build('curl', true, merge_list(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 .. '"', - })) + cmake_build('curl', true, merge_list(curl_common_defs, wild_zlib_32)) end if _OPTIONS["64-build"] then - cmake_build('curl', false, merge_list(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 .. '"', - })) + cmake_build('curl', false, merge_list(curl_common_defs, wild_zlib_64)) end end @@ -563,18 +555,10 @@ if _OPTIONS["build-protobuf"] or _OPTIONS["all-build"] then "protobuf_WITH_ZLIB=ON", } if _OPTIONS["32-build"] then - cmake_build('protobuf', true, merge_list(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 .. '"', - })) + cmake_build('protobuf', true, merge_list(proto_common_defs, wild_zlib_32)) end if _OPTIONS["64-build"] then - cmake_build('protobuf', false, merge_list(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 .. '"', - })) + cmake_build('protobuf', false, merge_list(proto_common_defs, wild_zlib_64)) end end