slvs 3.2__tar.gz

slvs-3.2/.clang-format

@@ -0,0 +1,41 @@
+---
+# Things explicitly enumerated in CONTRIBUTING.md
+IndentWidth: 4
+UseTab: Never
+SpaceBeforeParens: Never
+BreakBeforeBraces: Attach
+ColumnLimit: 100
+# Docs say 100, but some places look more like 80.
+#ColumnLimit: 80
+
+# Based on minimizing diff when applying clang-format
+AccessModifierOffset: -4
+AlignConsecutiveAssignments: true
+AlignEscapedNewlines: DontAlign
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakTemplateDeclarations: Yes # MultiLine
+BreakConstructorInitializers: BeforeColon
+DerivePointerAlignment: true
+FixNamespaceComments: true
+IndentPPDirectives: AfterHash
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: Inner
+SpaceAfterTemplateKeyword: false
+
+# No way to remove all space around operators as seen in much of the code I looked at.
+#SpaceBeforeAssignmentOperators: false
+
+# Only seen some of the time (mostly just variables, not functions)
+# but clang-format only has a true/false
+#AlignConsecutiveDeclarations: true
+
+
+# Would be nice to turn on eventually, maybe?
+SortIncludes: false
+SortUsingDeclarations: false
+
+# Hard to tell what the desired config here was.
+# AllowShortFunctionsOnASingleLine: Inline
+AllowShortFunctionsOnASingleLine: None

slvs-3.2/.git/HEAD

@@ -0,0 +1 @@
+477d4c87ca51b9727fbc0765cbd94253c3968b8b

slvs-3.2/.git/refs/tags/v3.2

@@ -0,0 +1 @@
+477d4c87ca51b9727fbc0765cbd94253c3968b8b

slvs-3.2/.gitattributes

@@ -0,0 +1,10 @@
+* text=auto
+*.cpp  text
+*.h    text
+*.txt  text
+*.gz   binary
+*.ico  binary
+*.jpg  binary
+*.lib  binary
+*.png  binary
+*.slvs binary

slvs-3.2/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,17 @@
+### System information
+
+- **SolveSpace version:** <!--e.g. 3.1~70bde63c; go to Help → About… / SolveSpace → About SolveSpace (macOS)-->
+- **Operating system:** <!--e.g. Debian testing-->
+
+### Expected behavior
+
+<!--What should have happened?-->
+
+### Actual behavior
+
+<!--What actually happened?-->
+
+### Additional information
+
+<!--For bugs, please attach a savefile that shows the problematic behavior.
+You can attach `.slvs` files by archiving them into a `.zip` first.-->

slvs-3.2/.github/scripts/build-macos.sh

@@ -0,0 +1,51 @@
+#!/bin/sh -xe
+
+ENABLE_SANITIZERS="OFF"
+if [ "$1" = "release" ]; then
+    BUILD_TYPE="RelWithDebInfo"
+    ENABLE_LTO="ON"
+else
+    BUILD_TYPE="Debug"
+    ENABLE_LTO="OFF"
+fi
+
+# this is an option for our Github CI only, since it doesn't have a macos arm64 image yet
+CMAKE_GENERATOR="Unix Makefiles"
+CMAKE_PREFIX_PATH=""
+if [ "$2" = "arm64" ]; then
+    OSX_ARCHITECTURE="arm64"
+    CMAKE_PREFIX_PATH=$(find /tmp/libomp-arm64/libomp -depth 1)
+    mkdir build-arm64 || true
+    cd build-arm64
+elif [ "$2" = "x86_64" ]; then
+    OSX_ARCHITECTURE="x86_64"
+    CMAKE_PREFIX_PATH=$(find /tmp/libomp-x86_64/libomp -depth 1)
+    mkdir build || true
+    cd build
+else
+    mkdir build || true
+    cd build
+fi
+
+if [ "$3" = "xcode" ]; then
+    CMAKE_GENERATOR="Xcode"
+fi
+
+cmake \
+    -G "${CMAKE_GENERATOR}" \
+    -D CMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}" \
+    -D CMAKE_OSX_ARCHITECTURES="${OSX_ARCHITECTURE}" \
+    -D CMAKE_BUILD_TYPE="${BUILD_TYPE}" \
+    -D ENABLE_OPENMP="ON" \
+    -D ENABLE_SANITIZERS="${ENABLE_SANITIZERS}" \
+    -D ENABLE_LTO="${ENABLE_LTO}" \
+    ..
+
+if [ "$3" = "xcode" ]; then
+    open solvespace.xcodeproj
+else
+    cmake --build . --config "${BUILD_TYPE}" -j$(sysctl -n hw.logicalcpu)
+    if [ $(uname -m) = "$2" ]; then
+        make -j$(sysctl -n hw.logicalcpu) test_solvespace
+    fi
+fi

slvs-3.2/.github/scripts/build-snap.sh

@@ -0,0 +1,3 @@
+#!/bin/sh -xe
+
+./pkg/snap/build.sh --use-lxd

slvs-3.2/.github/scripts/build-ubuntu.sh

@@ -0,0 +1,11 @@
+#!/bin/sh -xe
+
+mkdir build
+cd build
+cmake \
+  -DCMAKE_BUILD_TYPE="Debug" \
+  -DENABLE_OPENMP="ON" \
+  -DENABLE_SANITIZERS="ON" \
+  ..
+make -j$(nproc) VERBOSE=1
+make test_solvespace

slvs-3.2/.github/scripts/build-wasmlib.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+cd ..
+git clone https://github.com/emscripten-core/emsdk.git --depth 1
+cd emsdk
+./emsdk install latest
+./emsdk activate latest
+cd ../solvespace
+source ../emsdk/emsdk_env.sh
+mkdir -p build-wasmlib
+cd build-wasmlib
+emcmake cmake .. \
+  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+  -DENABLE_GUI="OFF" \
+  -DENABLE_CLI="OFF" \
+  -DENABLE_TESTS="OFF" \
+  -DENABLE_COVERAGE="OFF" \
+  -DENABLE_OPENMP="OFF" \
+  -DFORCE_VENDORED_Eigen3="ON" \
+  -DENABLE_LTO="ON"
+cmake --build . -j$(nproc) --target slvs-wasm

slvs-3.2/.github/scripts/build-web.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+if [ "$1" = "release" ]; then
+    BUILD_TYPE="Release"
+    ENABLE_LTO="ON"
+else
+    BUILD_TYPE="Debug"
+    ENABLE_LTO="OFF"
+fi
+
+cd ..
+git clone https://github.com/emscripten-core/emsdk.git --depth 1
+cd emsdk
+./emsdk install latest
+./emsdk activate latest
+cd ../solvespace
+source ../emsdk/emsdk_env.sh
+mkdir build
+cd build
+emcmake cmake .. \
+  -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \
+  -DENABLE_CLI="OFF" \
+  -DENABLE_TESTS="OFF" \
+  -DENABLE_COVERAGE="OFF" \
+  -DENABLE_OPENMP="OFF" \
+  -DENABLE_LTO="ON"
+cmake --build . --config "${BUILD_TYPE}" -j$(nproc) --target solvespace

slvs-3.2/.github/scripts/build-windows.sh

@@ -0,0 +1,53 @@
+#!/bin/sh -xe
+
+mkdir build
+cd build
+
+if [ "$1" = "release" ]; then
+    if [ "$2" = "openmp" ]; then
+        ENABLE_OPENMP="ON"
+    else
+        ENABLE_OPENMP="OFF"
+    fi
+
+    if [ "$3" = "x64" ]; then
+        PLATFORM="$3"
+    else
+        PLATFORM="Win32"
+    fi
+
+    BUILD_TYPE=RelWithDebInfo
+    cmake \
+        -G "Visual Studio 17 2022" \
+        -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \
+        -DENABLE_OPENMP="${ENABLE_OPENMP}" \
+        -DENABLE_LTO=ON \
+        -DCMAKE_GENERATOR_PLATFORM="${PLATFORM}" \
+        ..
+else
+    BUILD_TYPE=Debug
+    cmake \
+        -G "Visual Studio 17 2022" \
+        -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \
+        -DENABLE_OPENMP="ON" \
+        -DENABLE_SANITIZERS="ON" \
+        -DCMAKE_GENERATOR_PLATFORM="Win32" \
+        ..
+fi
+
+cmake --build . --config "${BUILD_TYPE}" -- -maxcpucount
+
+# Run the tests in the proper environment (required for having the ASan libraries available)
+cmake --build . --config "${BUILD_TYPE}" -t test_solvespace -- -maxcpucount
+
+if [ "$3" = "x64" ]; then
+	if [ "$2" != "openmp" ]; then
+		mv bin/$BUILD_TYPE/solvespace.exe bin/$BUILD_TYPE/solvespace_single_core_x64.exe
+	else
+		mv bin/$BUILD_TYPE/solvespace.exe bin/$BUILD_TYPE/solvespace_x64.exe
+	fi
+else
+	if [ "$2" != "openmp" ]; then
+		mv bin/$BUILD_TYPE/solvespace.exe bin/$BUILD_TYPE/solvespace_single_core.exe
+	fi
+fi

slvs-3.2/.github/scripts/install-macos.sh

@@ -0,0 +1,22 @@
+#!/bin/sh -xe
+set -o pipefail
+
+if [ "$1" = "ci" ]; then
+    brew_cache=$(brew --cache)
+    brew fetch --bottle-tag=arm64_tahoe libomp >/dev/null
+    brew fetch --bottle-tag=sonoma libomp >/dev/null
+    armloc=$(find "$brew_cache"/downloads -maxdepth 1 -name "*--libomp--*arm64_tahoe.bottle.tar.gz" -print | tail -n1)
+    x64loc=$(find "$brew_cache"/downloads -maxdepth 1 -name "*--libomp--*sonoma.bottle.tar.gz" -print | tail -n1)
+    [ -n "$armloc" ] || { echo "Failed to locate arm64 libomp bottle in cache" >&2; exit 1; }
+    [ -n "$x64loc" ] || { echo "Failed to locate x86_64 libomp bottle in cache" >&2; exit 1; }
+    cp "$armloc" /tmp/libomp-arm64.tar.gz
+    mkdir /tmp/libomp-arm64 || true
+    tar -xzvf /tmp/libomp-arm64.tar.gz -C /tmp/libomp-arm64
+    cp "$x64loc" /tmp/libomp-x86_64.tar.gz
+    mkdir /tmp/libomp-x86_64 || true
+    tar -xzvf /tmp/libomp-x86_64.tar.gz -C /tmp/libomp-x86_64
+else
+    brew install libomp
+fi
+
+git submodule update --init extlib/cairo extlib/freetype extlib/libdxfrw extlib/libpng extlib/mimalloc extlib/pixman extlib/zlib extlib/eigen

slvs-3.2/.github/scripts/install-snap.sh

@@ -0,0 +1,6 @@
+#!/bin/sh -xe
+
+sudo /snap/bin/lxd waitready
+sudo /snap/bin/lxd init --auto
+sudo chgrp travis /var/snap/lxd/common/lxd/unix.socket
+mkdir -p "$TRAVIS_BUILD_DIR/snaps-cache"

slvs-3.2/.github/scripts/install-ubuntu.sh

@@ -0,0 +1,10 @@
+#!/bin/sh -xe
+
+sudo apt-get update -qq
+
+sudo apt-get install -q -y \
+  zlib1g-dev libpng-dev libcairo2-dev libfreetype6-dev libjson-c-dev \
+  libfontconfig1-dev libgtkmm-3.0-dev libpangomm-1.4-dev libgl-dev \
+  libgl-dev libglu-dev libspnav-dev
+
+git submodule update --init extlib/libdxfrw extlib/mimalloc extlib/eigen

slvs-3.2/.github/scripts/install-web.sh

@@ -0,0 +1,3 @@
+#!/bin/sh -xe
+
+git submodule update --init

slvs-3.2/.github/scripts/install-windows.sh

@@ -0,0 +1,3 @@
+#!/bin/sh -xe
+
+git submodule update --init

slvs-3.2/.github/scripts/sign-macos.sh

@@ -0,0 +1,86 @@
+#!/bin/bash -xe
+
+lipo \
+    -create \
+        build/bin/SolveSpace.app/Contents/Resources/libomp.dylib \
+        build-arm64/bin/SolveSpace.app/Contents/Resources/libomp.dylib \
+    -output \
+        build/bin/SolveSpace.app/Contents/Resources/libomp.dylib
+
+lipo \
+    -create \
+        build/bin/SolveSpace.app/Contents/MacOS/SolveSpace \
+        build-arm64/bin/SolveSpace.app/Contents/MacOS/SolveSpace \
+    -output \
+        build/bin/SolveSpace.app/Contents/MacOS/SolveSpace
+
+lipo \
+    -create \
+        build/bin/SolveSpace.app/Contents/MacOS/solvespace-cli \
+        build-arm64/bin/SolveSpace.app/Contents/MacOS/solvespace-cli \
+    -output \
+        build/bin/SolveSpace.app/Contents/MacOS/solvespace-cli
+
+cd build
+
+openmp="bin/SolveSpace.app/Contents/Resources/libomp.dylib"
+app="bin/SolveSpace.app"
+dmg="bin/SolveSpace.dmg"
+bundle_id="com.solvespace.solvespace"
+
+if [ "$CI" = "true" ]; then
+    # get the signing certificate (this is the Developer ID:Application: Your Name, exported to a p12 file, then converted to base64, e.g.: cat ~/Desktop/certificate.p12 | base64 | pbcopy)
+    echo $MACOS_CERTIFICATE_P12 | base64 --decode > certificate.p12
+
+    # create a keychain
+    security create-keychain -p secret build.keychain
+    security default-keychain -s build.keychain
+    security unlock-keychain -p secret build.keychain
+
+    # import the key
+    security import certificate.p12 -k build.keychain -P "${MACOS_CERTIFICATE_PASSWORD}" -T /usr/bin/codesign
+
+    security set-key-partition-list -S apple-tool:,apple: -s -k secret build.keychain
+
+    # check if all is good
+    security find-identity -v
+fi
+
+# sign openmp
+codesign -s "${MACOS_DEVELOPER_ID}" --timestamp --options runtime -f --deep "${openmp}"
+
+# sign the .app
+codesign -s "${MACOS_DEVELOPER_ID}" --timestamp --options runtime -f --deep "${app}"
+
+# create the .dmg from the signed .app
+hdiutil create -srcfolder "${app}" "${dmg}"
+
+# sign the .dmg
+codesign -s "${MACOS_DEVELOPER_ID}" --timestamp --options runtime -f --deep "${dmg}"
+
+if ! command -v xcrun >/dev/null || ! xcrun --find notarytool >/dev/null; then
+    echo "Notarytool is not present in the system. Notarization has failed."
+    exit 1
+fi
+
+# Submit the package for notarization
+notarization_output=$(
+    xcrun notarytool submit "${dmg}" \
+        --apple-id "hello@koenschmeets.nl" \
+        --password "${MACOS_APPSTORE_APP_PASSWORD}" \
+        --team-id "8X77K9NDG3" \
+        --wait 2>&1)
+
+if [ $? -eq 0 ]; then
+    # Extract the operation ID from the output
+    operation_id=$(echo "$notarization_output" | awk '/RequestUUID/ {print $NF}')
+    echo "Notarization submitted. Operation ID: $operation_id"
+    exit 0
+  else
+    echo "Notarization failed. Error: $notarization_output"
+    exit 1
+  fi
+fi
+
+# staple
+xcrun stapler staple "${dmg}"

slvs-3.2/.github/workflows/cd.yml

@@ -0,0 +1,268 @@
+name: CD
+
+on:
+  push:
+    branches:
+      - master
+  release:
+    types:
+      - created
+
+jobs:
+  cancel_previous_runs:
+    runs-on: ubuntu-latest
+    name: Cancel Previous Runs
+    permissions:
+      actions: write
+    steps:
+    - uses: styfle/cancel-workflow-action@0.12.1
+      with:
+        access_token: ${{ github.token }}
+
+  test_ubuntu:
+    needs: [cancel_previous_runs]
+    runs-on: ubuntu-latest
+    name: Test Ubuntu
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install Dependencies
+      run: .github/scripts/install-ubuntu.sh
+    - name: Build & Test
+      run: .github/scripts/build-ubuntu.sh
+
+  test_windows:
+    needs: [cancel_previous_runs]
+    runs-on: windows-2022
+    name: Test Windows
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install Dependencies
+      run: .github/scripts/install-windows.sh
+      shell: bash
+    - name: Build & Test
+      run: .github/scripts/build-windows.sh
+      shell: bash
+
+  test_macos:
+    needs: [cancel_previous_runs]
+    runs-on: macos-latest
+    name: Test macOS
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install Dependencies
+      run: .github/scripts/install-macos.sh ci
+    - name: Build & Test
+      run: .github/scripts/build-macos.sh debug arm64 && .github/scripts/build-macos.sh debug x86_64
+
+  build_release_windows:
+    needs: [test_ubuntu, test_windows, test_macos]
+    name: Build Release Windows
+    runs-on: windows-2022
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install Dependencies
+        run: .github/scripts/install-windows.sh
+        shell: bash
+      - name: Build & Test
+        run: .github/scripts/build-windows.sh release
+        shell: bash
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: windows_single_core
+          path: build/bin/RelWithDebInfo/solvespace_single_core.exe
+
+  build_release_windows_openmp:
+    needs: [test_ubuntu, test_windows, test_macos]
+    name: Build Release Windows (OpenMP)
+    runs-on: windows-2022
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install Dependencies
+        run: .github/scripts/install-windows.sh
+        shell: bash
+      - name: Build & Test
+        run: .github/scripts/build-windows.sh release openmp
+        shell: bash
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: windows
+          path: build/bin/RelWithDebInfo/solvespace.exe
+
+  build_release_windows_x64:
+    needs: [test_ubuntu, test_windows, test_macos]
+    name: Build Release Windows x64
+    runs-on: windows-2022
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install Dependencies
+        run: .github/scripts/install-windows.sh
+        shell: bash
+      - name: Build & Test
+        run: .github/scripts/build-windows.sh release not_openmp x64
+        shell: bash
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: windows_single_core_x64
+          path: build/bin/RelWithDebInfo/solvespace_single_core_x64.exe
+
+  build_release_windows_openmp_x64:
+    needs: [test_ubuntu, test_windows, test_macos]
+    name: Build Release Windows (OpenMP) x64
+    runs-on: windows-2022
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install Dependencies
+        run: .github/scripts/install-windows.sh
+        shell: bash
+      - name: Build & Test
+        run: .github/scripts/build-windows.sh release openmp x64
+        shell: bash
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: windows_x64
+          path: build/bin/RelWithDebInfo/solvespace_x64.exe
+
+  build_release_macos:
+    needs: [test_ubuntu, test_windows, test_macos]
+    name: Build Release macOS
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install Dependencies
+      run: .github/scripts/install-macos.sh ci
+    - name: Build & Test
+      run: .github/scripts/build-macos.sh release arm64 && .github/scripts/build-macos.sh release x86_64
+    - name: Sign Build
+      run: .github/scripts/sign-macos.sh
+      env:
+        MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
+        MACOS_CERTIFICATE_P12: ${{ secrets.MACOS_CERTIFICATE_P12 }}
+        MACOS_APPSTORE_APP_PASSWORD: ${{ secrets.MACOS_APPSTORE_APP_PASSWORD }}
+        MACOS_APPSTORE_USERNAME: ${{ secrets.MACOS_APPSTORE_USERNAME }}
+        MACOS_DEVELOPER_ID: ${{ secrets.MACOS_DEVELOPER_ID }}
+    - name: Upload artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: macos
+        path: build/bin/SolveSpace.dmg
+
+  build_release_web:
+    needs: [test_ubuntu, test_windows, test_macos]
+    name: Build Release Web
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install Dependencies
+      run: .github/scripts/install-web.sh
+    - name: Build & Pack
+      run: |
+        .github/scripts/build-web.sh release
+        cd build/bin
+        rm *.a || true
+    - name: Upload artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: solvespace_web
+        path: build/bin/
+
+  # deploy_snap_amd64:
+  #   needs: [test_ubuntu, test_windows, test_macos]
+  #   name: Deploy AMD64 Snap
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #   - uses: actions/checkout@v4
+  #   - name: Fetch Tags
+  #     run: git fetch --force --tags
+  #   - name: Set Up Source
+  #     run: rsync --filter=":- .gitignore" -r ./ pkg/snap/solvespace-snap-src
+  #   - name: Build Snap
+  #     uses: snapcore/action-build@v1
+  #     id: build
+  #     with:
+  #       path: pkg/snap
+  #   - name: Upload & Release to Edge
+  #     if: github.event_name == 'push'
+  #     uses: snapcore/action-publish@v1
+  #     env:
+  #       SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPSTORE_LOGIN }}
+  #     with:
+  #       snap: ${{ steps.build.outputs.snap }}
+  #       release: edge
+  #   - name: Upload & Release to Beta + Edge
+  #     if: github.event_name == 'release'
+  #     uses: snapcore/action-publish@v1
+  #     with:
+  #       store_login: ${{ secrets.SNAPSTORE_LOGIN }}
+  #       snap: ${{ steps.build.outputs.snap }}
+  #       release: edge,beta
+
+  upload_release_assets:
+    name: Upload Release Assets
+    needs: [build_release_windows, build_release_windows_openmp, build_release_windows_x64, build_release_windows_openmp_x64, build_release_macos]
+    if: "!cancelled() && github.event_name == 'release'"
+    runs-on: ubuntu-latest
+    steps:
+    - name: Download All Workflow Artifacts
+      uses: actions/download-artifact@v4
+    - name: Get Release Upload URL
+      id: get_upload_url
+      env:
+        event: ${{ toJson(github.event) }}
+      run: |
+        upload_url=$(echo "$event" | jq -r ".release.upload_url")
+        echo "::set-output name=upload_url::$upload_url"
+        echo "Upload URL: $upload_url"
+    - name: Upload solvespace.exe
+      uses: actions/upload-release-asset@v1
+      continue-on-error: true
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.get_upload_url.outputs.upload_url }}
+        asset_path: windows/solvespace.exe
+        asset_name: solvespace.exe
+        asset_content_type: binary/octet-stream
+    - name: Upload solvespace_single_core.exe
+      uses: actions/upload-release-asset@v1
+      continue-on-error: true
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.get_upload_url.outputs.upload_url }}
+        asset_path: windows-openmp/solvespace_single_core.exe
+        asset_name: solvespace_single_core.exe
+        asset_content_type: binary/octet-stream
+    - name: Upload solvespace_x64.exe
+      uses: actions/upload-release-asset@v1
+      continue-on-error: true
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.get_upload_url.outputs.upload_url }}
+        asset_path: windows/solvespace_x64.exe
+        asset_name: solvespace_x64.exe
+        asset_content_type: binary/octet-stream
+    - name: Upload solvespace_single_core_x64.exe
+      uses: actions/upload-release-asset@v1
+      continue-on-error: true
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.get_upload_url.outputs.upload_url }}
+        asset_path: windows-openmp/solvespace_single_core_x64.exe
+        asset_name: solvespace_single_core_x64.exe
+        asset_content_type: binary/octet-stream
+    - name: Upload SolveSpace.dmg
+      uses: actions/upload-release-asset@v1
+      continue-on-error: true
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.get_upload_url.outputs.upload_url }}
+        asset_path: macos/SolveSpace.dmg
+        asset_name: SolveSpace.dmg
+        asset_content_type: binary/octet-stream