Northern_Lights/nekoray_Mahdi-zarei
1
0
Fork 0
mirror of https://github.com/Mahdi-zarei/nekoray.git synced 2025-12-19 13:50:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Fix Curl static build

Browse Source
This commit is contained in:
Nova 2024-08-13 16:21:35 +03:30
parent 71e16b456a
commit 651ebd7d99
No known key found for this signature in database
GPG Key ID: 2DB5135C64EC8AC6
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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}")

6
libs/build_deps_all.sh
View File

@ -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 ../..

2
libs/deploy_linux64.sh
View File

@ -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