diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1fda871c9..00fd21796 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -127,39 +127,21 @@ jobs: with: submodules: recursive -# - name: Cache LLVM -# id: cache-llvm -# uses: actions/cache@v1 -# with: -# path: ../LLVM -# key: ${{runner.os}}-LLVMCache-${{env.LLVM_VERSION}} - - - name: Download LLVM -# if: steps.cache-llvm.outputs.cache-hit != 'true' - uses: suisei-cn/actions-download-file@v1 - id: download-llvm - with: - url: https://axiodl.com/files/LLVM-${{env.LLVM_VERSION}}-win64.exe - target: ../temp - - name: Install LLVM -# if: steps.cache-llvm.outputs.cache-hit != 'true' - shell: cmd - working-directory: ../temp - run: ${{steps.download-llvm.outputs.filename}} /S /D=%RUNNER_WORKSPACE%\LLVM + run: | + $TempDir = "$env:RUNNER_WORKSPACE\temp" + $Filename = "LLVM-$env:LLVM_VERSION-win64.exe" + New-Item -Path "$TempDir" -ItemType Directory -ea 0 + (New-Object Net.WebClient).DownloadFile("https://axiodl.com/files/$Filename", "$TempDir\$Filename") + Start-Process "$TempDir\$Filename" -ArgumentList "/S /D=$env:RUNNER_WORKSPACE\LLVM" -Wait - #- name: Cache Qt - # id: cache-qt - # uses: actions/cache@v1 - # with: - # path: ../Qt - # key: ${{runner.os}}-QtCache-${{env.Qt_VERSION}} - - #- name: Install Qt - # uses: jurplel/install-qt-action@v2 - # with: - # version: ${{env.Qt_VERSION}} - # cached: ${{steps.cache-qt.outputs.cache-hit}} + - name: Install vcpkg Qt + run: | + $TempDir = "$env:RUNNER_WORKSPACE\temp" + $Filename = "vcpkg-qt-$env:Qt_VERSION.7z" + New-Item -Path "$TempDir" -ItemType Directory -ea 0 + (New-Object Net.WebClient).DownloadFile("https://axiodl.com/files/$Filename", "$TempDir\$Filename") + 7z x "-o$env:RUNNER_WORKSPACE" -aos "$TempDir\$Filename" # - name: Install dependencies # run: choco install ninja vulkan-sdk @@ -175,6 +157,7 @@ jobs: run: | $workspace = $env:RUNNER_WORKSPACE -replace '\\', '/' cmake $env:GITHUB_WORKSPACE -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DURDE_VECTOR_ISA=sse41 ` + -DCMAKE_TOOLCHAIN_FILE="$workspace/vcpkg-qt-$env:Qt_VERSION/scripts/buildsystems/vcpkg.cmake" ` -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DCMAKE_CXX_FLAGS= -DCMAKE_C_FLAGS= ` -DLLVM_ROOT_DIR="$workspace/LLVM" ` -DURDE_DLPACKAGE=urde-$env:GITHUB_RUN_NUMBER-win32-msvc-x86_64 @@ -204,39 +187,21 @@ jobs: with: submodules: recursive -# - name: Cache LLVM -# id: cache-llvm -# uses: actions/cache@v1 -# with: -# path: ../LLVM -# key: ${{runner.os}}-LLVMCache-${{env.LLVM_VERSION}} - - - name: Download LLVM -# if: steps.cache-llvm.outputs.cache-hit != 'true' - uses: suisei-cn/actions-download-file@v1 - id: download-llvm - with: - url: https://axiodl.com/files/LLVM-${{env.LLVM_VERSION}}-win64.exe - target: ../temp - - name: Install LLVM -# if: steps.cache-llvm.outputs.cache-hit != 'true' - shell: cmd - working-directory: ../temp - run: ${{steps.download-llvm.outputs.filename}} /S /D=%RUNNER_WORKSPACE%\LLVM + run: | + $TempDir = "$env:RUNNER_WORKSPACE\temp" + $Filename = "LLVM-$env:LLVM_VERSION-win64.exe" + New-Item -Path "$TempDir" -ItemType Directory -ea 0 + (New-Object Net.WebClient).DownloadFile("https://axiodl.com/files/$Filename", "$TempDir\$Filename") + Start-Process "$TempDir\$Filename" -ArgumentList "/S /D=$env:RUNNER_WORKSPACE\LLVM" -Wait - - name: Cache Qt - id: cache-qt - uses: actions/cache@v1 - with: - path: ../Qt - key: ${{runner.os}}-QtCache-${{env.Qt_VERSION}} - - - name: Install Qt - uses: jurplel/install-qt-action@v2 - with: - version: ${{env.Qt_VERSION}} - cached: ${{steps.cache-qt.outputs.cache-hit}} + - name: Install vcpkg Qt + run: | + $TempDir = "$env:RUNNER_WORKSPACE\temp" + $Filename = "vcpkg-qt-$env:Qt_VERSION.7z" + New-Item -Path "$TempDir" -ItemType Directory -ea 0 + (New-Object Net.WebClient).DownloadFile("https://axiodl.com/files/$Filename", "$TempDir\$Filename") + 7z x "-o$env:RUNNER_WORKSPACE" -aos "$TempDir\$Filename" - name: Install dependencies run: choco install ninja vulkan-sdk @@ -252,6 +217,7 @@ jobs: run: | $workspace = $env:RUNNER_WORKSPACE -replace '\\', '/' cmake $env:GITHUB_WORKSPACE -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DURDE_VECTOR_ISA=sse41 ` + -DCMAKE_TOOLCHAIN_FILE="$workspace/vcpkg-qt-$env:Qt_VERSION/scripts/buildsystems/vcpkg.cmake" ` -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded ` -DCMAKE_C_COMPILER="$workspace/LLVM/bin/clang-cl.exe" ` -DCMAKE_CXX_COMPILER="$workspace/LLVM/bin/clang-cl.exe" ` diff --git a/CMakeSettings.json b/CMakeSettings.json index 7e7b5d6bd..9934b0489 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -13,7 +13,7 @@ "variables": [ { "name": "CMAKE_MSVC_RUNTIME_LIBRARY", - "value": "MultiThreadedDebug", + "value": "MultiThreadedDebugDLL", "type": "STRING" }, { @@ -46,7 +46,7 @@ "variables": [ { "name": "CMAKE_MSVC_RUNTIME_LIBRARY", - "value": "MultiThreaded", + "value": "MultiThreadedDLL", "type": "STRING" }, { @@ -122,7 +122,7 @@ "variables": [ { "name": "CMAKE_MSVC_RUNTIME_LIBRARY", - "value": "MultiThreadedDebug", + "value": "MultiThreadedDebugDLL", "type": "STRING" }, { @@ -150,7 +150,7 @@ "variables": [ { "name": "CMAKE_MSVC_RUNTIME_LIBRARY", - "value": "MultiThreaded", + "value": "MultiThreadedDLL", "type": "STRING" }, { diff --git a/hecl-gui b/hecl-gui index 8a3c11ab6..808101488 160000 --- a/hecl-gui +++ b/hecl-gui @@ -1 +1 @@ -Subproject commit 8a3c11ab697016831b16b5d1ebfa3ad66e2b954c +Subproject commit 808101488324f1ba7b000fb54320cd33ad9928bf