diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9726a70..296b6e2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -146,37 +146,41 @@ jobs: id: cache-vulkansdk uses: actions/cache@v1 with: - path: "vulkansdk-macos-1.2.189.0" - key: vulkansdk-macos-1.2.189.0 + path: "vulkansdk-macos-1.2.162.0" + key: vulkansdk-macos-1.2.162.0 - name: vulkansdk if: steps.cache-vulkansdk.outputs.cache-hit != 'true' run: | - brew install vulkan-tools - wget https://sdk.lunarg.com/sdk/download/1.2.189.0/mac/vulkansdk-macos-1.2.189.0.dmg?Human=true -O vulkansdk-macos-1.2.189.0.dmg - hdiutil attach vulkansdk-macos-1.2.189.0.dmg - cp -r /Volumes/vulkansdk-macos-1.2.189.0 . - ls - rm -rf vulkansdk-macos-1.2.189.0/Applications - find vulkansdk-macos-1.2.189.0 -type f | grep -v -E 'vulkan|glslang|MoltenVK' | xargs rm - hdiutil detach /Volumes/vulkansdk-macos-1.2.189.0 + wget https://github.com/TNTwise/Rife-Vulkan-Models/releases/download/1/vulkansdk-macos-1.2.162.0.dmg -O vulkansdk-macos-1.2.162.0.dmg + hdiutil attach vulkansdk-macos-1.2.162.0.dmg + cp -r /Volumes/vulkansdk-macos-1.2.162.0 . + rm -rf vulkansdk-macos-1.2.162.0/Applications + find vulkansdk-macos-1.2.162.0 -type f | grep -v -E 'vulkan|glslang|MoltenVK' | xargs rm + hdiutil detach /Volumes/vulkansdk-macos-1.2.162.0 - name: build-x86_64 run: | - brew install vulkan-tools - wget https://sdk.lunarg.com/sdk/download/1.2.189.0/mac/vulkansdk-macos-1.2.189.0.dmg?Human=true -O vulkansdk-macos-1.2.189.0.dmg - hdiutil attach vulkansdk-macos-1.2.189.0.dmg - cp -r /Volumes/vulkansdk-macos-1.2.189.0 . - ls - rm -rf vulkansdk-macos-1.2.189.0/Applications - find vulkansdk-macos-1.2.189.0 -type f | grep -v -E 'vulkan|glslang|MoltenVK' | xargs rm - hdiutil detach /Volumes/vulkansdk-macos-1.2.189.0 - export VULKAN_SDK=`pwd`/vulkansdk-macos-1.2.189.0/macOS + export VULKAN_SDK=`pwd`/vulkansdk-macos-1.2.162.0/macOS mkdir build-x86_64 && cd build-x86_64 cmake -DUSE_STATIC_MOLTENVK=ON -DCMAKE_OSX_ARCHITECTURES="x86_64" \ -DOpenMP_C_FLAGS="-Xclang -fopenmp" -DOpenMP_CXX_FLAGS="-Xclang -fopenmp" \ -DOpenMP_C_LIB_NAMES="libomp" -DOpenMP_CXX_LIB_NAMES="libomp" \ -DOpenMP_libomp_LIBRARY="$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/libomp.a" \ + -DVulkan_INCLUDE_DIR=`pwd`/../vulkansdk-macos-1.2.162.0/MoltenVK/include \ + -DVulkan_LIBRARY=`pwd`/../vulkansdk-macos-1.2.162.0/MoltenVK/MoltenVK.xcframework/macos-arm64_x86_64/libMoltenVK.a \ + ../src + cmake --build . -j 3 + - name: build-arm64 + run: | + export VULKAN_SDK=`pwd`/vulkansdk-macos-1.2.162.0/macOS + mkdir build-arm64 && cd build-arm64 + cmake -DUSE_STATIC_MOLTENVK=ON -DCMAKE_OSX_ARCHITECTURES="arm64" \ + -DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_PROCESSOR=arm64 \ + -DOpenMP_C_FLAGS="-Xclang -fopenmp" -DOpenMP_CXX_FLAGS="-Xclang -fopenmp" \ + -DOpenMP_C_LIB_NAMES="libomp" -DOpenMP_CXX_LIB_NAMES="libomp" \ + -DOpenMP_libomp_LIBRARY="$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/libomp.a" \ + -DVulkan_INCLUDE_DIR=`pwd`/../vulkansdk-macos-1.2.162.0/MoltenVK/include \ + -DVulkan_LIBRARY=`pwd`/../vulkansdk-macos-1.2.162.0/MoltenVK/MoltenVK.xcframework/macos-arm64_x86_64/libMoltenVK.a \ ../src - cmake --build . -j 3 # - name: build-arm64 # run: | @@ -332,4 +336,4 @@ jobs: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: artifacts/windows/master-windows.zip asset_name: windows.zip - asset_content_type: application/zip \ No newline at end of file + asset_content_type: application/zip