diff --git a/.github/workflows/CreateRelease.yml b/.github/workflows/CreateRelease.yml index 7b512aa2c..ae3b7c946 100644 --- a/.github/workflows/CreateRelease.yml +++ b/.github/workflows/CreateRelease.yml @@ -163,12 +163,6 @@ jobs: with: ref: master submodules: true - - name: Download Jom - run: | - Invoke-WebRequest -Uri "http://mirrors.ukfast.co.uk/sites/qt.io/official_releases/jom/jom_1_1_3.zip" -OutFile "jom_1_1_3.zip" - New-Item -Name "jom" -ItemType "directory" - Expand-Archive -Path jom_1_1_3.zip -DestinationPath .\jom - echo "$(Get-Location)\jom" >> GITHUB_PATH - name: Setup MSVC uses: ilammy/msvc-dev-cmd@v1 - name: Install Qt diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml index f888440b3..517d948cd 100644 --- a/.github/workflows/Windows.yml +++ b/.github/workflows/Windows.yml @@ -14,12 +14,6 @@ jobs: - uses: actions/checkout@v2 with: submodules: true - - name: Download Jom - run: | - Invoke-WebRequest -Uri "http://mirrors.ukfast.co.uk/sites/qt.io/official_releases/jom/jom_1_1_3.zip" -OutFile "jom_1_1_3.zip" - New-Item -Name "jom" -ItemType "directory" - Expand-Archive -Path jom_1_1_3.zip -DestinationPath .\jom - echo "$(Get-Location)\jom" >> GITHUB_PATH - name: Setup MSVC uses: ilammy/msvc-dev-cmd@v1 - name: Install Qt diff --git a/scripts/Windows/1_build.sh b/scripts/Windows/1_build.sh index 995a24a76..e9faa9aab 100644 --- a/scripts/Windows/1_build.sh +++ b/scripts/Windows/1_build.sh @@ -16,7 +16,6 @@ SCRIPTS_PATH="$(dirname "$(realpath "$0")")" SOURCE_PATH=$SCRIPTS_PATH/../../src BUILD_PATH=$SOURCE_PATH/build INSTALL_PATH=$SOURCE_PATH/install -CORES="-j4" DOUBLE_PRECISION_OPTION="" NIGHTLY_OPTION="" RC_OPTION="" @@ -33,10 +32,6 @@ case $i in INSTALL_PATH="${i#*=}" shift # past argument=value ;; - -j*) - CORES=$i - shift # past argument=value - ;; -d|--double_precision) DOUBLE_PRECISION_OPTION="-DBUILD_WITH_DOUBLE_SCALAR=ON" shift # past argument=value