Try to fix Linux and Windows builds once again

Xpl0itU · Jan 20, 2024 · d6bf7e6 · d6bf7e6
1 parent 59bf4fc
commit d6bf7e6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Deploy WiiUDownloader
         run: |
           mv main WiiUDownloader
-          docker run --privileged --rm -e DEPLOY_GTK_VERSION=3 -e OUTPUT="WiiUDownloader-Linux-x86_64.AppImage" -e UPDATE_INFORMATION="gh-releases-zsync|Xpl0itU|WiiUDownloader|latest|WiiUDownloader-*.AppImage.zsync" -v ${PWD}:/project builder linuxdeploy.AppImage --plugin gtk --plugin checkrt --output=appimage --create-desktop-file --executable=WiiUDownloader --appdir dist --icon-file data/WiiUDownloader.png --library pkg/aria2go/aria2-lib/lib/libcrypto.so.1.1 --library pkg/aria2go/aria2-lib/lib/libssl.so.1.1 --library pkg/aria2go/aria2-lib/lib/libcrypto.so --library pkg/aria2go/aria2-lib/lib/libssl.so
+          docker run --privileged --rm -e DEPLOY_GTK_VERSION=3 -e OUTPUT="WiiUDownloader-Linux-x86_64.AppImage" -e UPDATE_INFORMATION="gh-releases-zsync|Xpl0itU|WiiUDownloader|latest|WiiUDownloader-*.AppImage.zsync" -v ${PWD}:/project builder linuxdeploy.AppImage --plugin gtk --plugin checkrt --output=appimage --create-desktop-file --executable=WiiUDownloader --appdir dist --icon-file data/WiiUDownloader.png
       - name: Upload Linux Artifact
         uses: ncipollo/release-action@v1
         with:

diff --git a/pkg/aria2go/libaria2.go b/pkg/aria2go/libaria2.go
@@ -7,6 +7,7 @@ package aria2go
  #cgo LDFLAGS: -L./aria2-lib/lib
  #cgo LDFLAGS: -laria2 -lcares -lssl -lcrypto
  #cgo darwin LDFLAGS: -framework Security
+ #cgo windows LDFLAGS:  -lWS2_32
  #include <stdlib.h>
  #include "aria2_c.h"
 */

diff --git a/prepare_aria.sh b/prepare_aria.sh
@@ -65,8 +65,8 @@ fi
 tar zxvf openssl-${OPENSSL_V}.tar.gz
 cd openssl-${OPENSSL_V}
 PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig/ \
-    LD_LIBRARY_PATH=${PREFIX}/lib/ CC="$C_COMPILER" CXX="$CXX_COMPILER" \
-    ./config --prefix=${PREFIX}
+    CC="$C_COMPILER" CXX="$CXX_COMPILER" \
+    ./config
 make -j`nproc`
 make install_sw
 cd ..