From b17e3b7be39dcf5cc61186babe7de0d8599735cf Mon Sep 17 00:00:00 2001 From: Nemirtingas Date: Wed, 21 Aug 2019 21:35:41 +0200 Subject: [PATCH] Added win static build for curl --- build_curl.sh | 4 ++++ build_env_x64.bat | 0 build_env_x86.bat | 0 build_linux.sh | 0 build_set_protobuf_directories.bat | 0 build_steamos.sh | 0 build_win_debug_experimental.bat | 0 build_win_find_interfaces.bat | 0 build_win_lobby_connect.bat | 0 build_win_release.bat | 0 build_win_release_experimental.bat | 0 curl/CMakeLists.txt | 3 --- 12 files changed, 4 insertions(+), 3 deletions(-) mode change 100644 => 100755 build_curl.sh mode change 100644 => 100755 build_env_x64.bat mode change 100644 => 100755 build_env_x86.bat mode change 100644 => 100755 build_linux.sh mode change 100644 => 100755 build_set_protobuf_directories.bat mode change 100644 => 100755 build_steamos.sh mode change 100644 => 100755 build_win_debug_experimental.bat mode change 100644 => 100755 build_win_find_interfaces.bat mode change 100644 => 100755 build_win_lobby_connect.bat mode change 100644 => 100755 build_win_release.bat mode change 100644 => 100755 build_win_release_experimental.bat diff --git a/build_curl.sh b/build_curl.sh old mode 100644 new mode 100755 index 6d40296..4fb9d47 --- a/build_curl.sh +++ b/build_curl.sh @@ -32,6 +32,10 @@ args+=($build_testing) args+=($build_type) args+=($custom_arch_var) +if [ ! -z "$EXTRA_CMAKE_ENV" ]; then + args+=("-DCURL_STATIC_CRT=ON") +fi + # EXTRA_CMAKE_ENV is set by setup_clang_env.sh to build for windows. # You must run setup_clang_env.sh before calling this script if you build for windows. diff --git a/build_env_x64.bat b/build_env_x64.bat old mode 100644 new mode 100755 diff --git a/build_env_x86.bat b/build_env_x86.bat old mode 100644 new mode 100755 diff --git a/build_linux.sh b/build_linux.sh old mode 100644 new mode 100755 diff --git a/build_set_protobuf_directories.bat b/build_set_protobuf_directories.bat old mode 100644 new mode 100755 diff --git a/build_steamos.sh b/build_steamos.sh old mode 100644 new mode 100755 diff --git a/build_win_debug_experimental.bat b/build_win_debug_experimental.bat old mode 100644 new mode 100755 diff --git a/build_win_find_interfaces.bat b/build_win_find_interfaces.bat old mode 100644 new mode 100755 diff --git a/build_win_lobby_connect.bat b/build_win_lobby_connect.bat old mode 100644 new mode 100755 diff --git a/build_win_release.bat b/build_win_release.bat old mode 100644 new mode 100755 diff --git a/build_win_release_experimental.bat b/build_win_release_experimental.bat old mode 100644 new mode 100755 diff --git a/curl/CMakeLists.txt b/curl/CMakeLists.txt index 7894dc9..cfaca4f 100644 --- a/curl/CMakeLists.txt +++ b/curl/CMakeLists.txt @@ -38,9 +38,6 @@ else() else() message(FATAL_ERROR "Arch unknown") endif() - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fPIC") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fPIC") - endif() set(CMAKE_CXX_STANDARD 11)