From 2e0ae6d82c968ae735cb9a5f650afc939973771d Mon Sep 17 00:00:00 2001 From: SoftFever Date: Sat, 7 Oct 2023 00:08:17 +0800 Subject: [PATCH 1/3] build on all platforms --- .github/workflows/build_deps.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index 0458be9371..ba649d7263 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -25,12 +25,12 @@ jobs: fail-fast: false matrix: include: - # - os: ubuntu-22.04 + - os: ubuntu-20.04 - os: windows-latest - # - os: macos-12 - # arch: x86_64 - # - os: macos-12 - # arch: arm64 + - os: macos-12 + arch: x86_64 + - os: macos-12 + arch: arm64 runs-on: ${{ matrix.os }} steps: @@ -82,7 +82,7 @@ jobs: ./build_release_macos.sh -dp -a arm64 - name: Build on Ubuntu - if: matrix.os == 'ubuntu-22.04' + if: matrix.os == 'ubuntu-20.04' working-directory: ${{ github.workspace }} run: | sudo apt-get update @@ -119,7 +119,7 @@ jobs: path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep - name: Upload Ubuntu artifacts - if: matrix.os == 'ubuntu-22.04' + if: matrix.os == 'ubuntu-20.04' uses: actions/upload-artifact@v3 with: name: OrcaSlicer_dep_ubuntu_${{ env.date }} From 37519b76d8d5c4cfd57f8ac0e8a338610b51140c Mon Sep 17 00:00:00 2001 From: SoftFever Date: Sat, 7 Oct 2023 00:40:03 +0800 Subject: [PATCH 2/3] fix GMP downloading issues --- deps/GMP/GMP.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/GMP/GMP.cmake b/deps/GMP/GMP.cmake index 94fe60b24a..8629f834fa 100644 --- a/deps/GMP/GMP.cmake +++ b/deps/GMP/GMP.cmake @@ -57,7 +57,7 @@ else () endif () ExternalProject_Add(dep_GMP - URL https://gmplib.org/download/gmp/gmp-6.2.1.tar.bz2 + URL https://github.com/SoftFever/OrcaSlicer_deps/releases/download/gmp-6.2.1/gmp-6.2.1.tar.bz2 URL_HASH SHA256=eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/GMP BUILD_IN_SOURCE ON From 95311f9875e70675080e4821ff1dd2651f0e5d2f Mon Sep 17 00:00:00 2001 From: SoftFever Date: Sat, 7 Oct 2023 12:51:22 +0800 Subject: [PATCH 3/3] fix linux Signed-off-by: SoftFever --- BuildLinux.sh | 2 +- deps/CURL/CURL.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/BuildLinux.sh b/BuildLinux.sh index 0314824c22..894da8aa6d 100755 --- a/BuildLinux.sh +++ b/BuildLinux.sh @@ -178,7 +178,7 @@ then # make deps echo "[4/9] Building dependencies..." - make -j$NCORES + make deps -j$NCORES echo "done" # rename wxscintilla # TODO: DeftDawg: Does OrcaSlicer need this? diff --git a/deps/CURL/CURL.cmake b/deps/CURL/CURL.cmake index b8d18be9c8..92cfbb892a 100644 --- a/deps/CURL/CURL.cmake +++ b/deps/CURL/CURL.cmake @@ -65,6 +65,7 @@ orcaslicer_add_cmake_project(CURL # ${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/curl-mods.patch CMAKE_ARGS -DBUILD_TESTING:BOOL=OFF + -DBUILD_CURL_EXE:BOOL=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCURL_STATICLIB=${_curl_static} ${_curl_platform_flags}