diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a994db..43930c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,8 +32,8 @@ list(APPEND NKR_LIBS ${CMAKE_SOURCE_DIR}/libs/deps/built) list(APPEND CMAKE_PREFIX_PATH ${NKR_LIBS}) if(WIN32) list(APPEND CMAKE_PREFIX_PATH "libs/deps/built/x64-windows-static") - add_definitions(-DCURL_STATICLIB) endif () +add_definitions(-DCURL_STATICLIB) message("[CMAKE_PREFIX_PATH] ${CMAKE_PREFIX_PATH}") diff --git a/libs/build_deps_all.sh b/libs/build_deps_all.sh index 95ba9b4..c53fbd9 100755 --- a/libs/build_deps_all.sh +++ b/libs/build_deps_all.sh @@ -15,8 +15,8 @@ fi mkdir -p $deps cd $deps INSTALL_PREFIX=$PWD/built -#rm -rf $INSTALL_PREFIX -#mkdir -p $INSTALL_PREFIX +rm -rf $INSTALL_PREFIX +mkdir -p $INSTALL_PREFIX #### clean #### clean() { @@ -93,7 +93,7 @@ if [[ "$(uname -s)" == *"NT"* ]]; then cd curl git checkout 83bedbd730d62b83744cc26fa0433d3f6e2e4cd6 mkdir build && cd build - cmake -GNinja .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX + cmake -GNinja .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -DCURL_STATICLIB=ON ninja && ninja install cd ../.. diff --git a/libs/deploy_linux64.sh b/libs/deploy_linux64.sh index b6b45e8..f50e61a 100755 --- a/libs/deploy_linux64.sh +++ b/libs/deploy_linux64.sh @@ -38,6 +38,6 @@ rm -r ./usr/translations ./usr/bin ./usr/share ./apprun-hooks # fix extra libs... mkdir ./usr/lib2 ls ./usr/lib/ -cp ./usr/lib/libQt* ./usr/lib/libxcb-util* ./usr/lib/libicuuc* ./usr/lib/libicui18n* ./usr/lib/libicudata* ./usr/lib2 +cp ./usr/lib/libQt* ./usr/lib/libxcb-util* ./usr/lib/libicuuc* ./usr/lib/libicui18n* ./usr/lib/libicudata* ./usr/lib/libssl* ./usr/lib/libcrypto* ./usr/lib2 rm -r ./usr/lib mv ./usr/lib2 ./usr/lib