Update

Me4-test · Aug 8, 2024 · dbd5434 · dbd5434
1 parent c3fb3de
commit dbd5434
Showing 1 changed file with 25 additions and 31 deletions.
diff --git a/.github/actions/build_moltenvk_dxvk/action.yml b/.github/actions/build_moltenvk_dxvk/action.yml
@@ -23,12 +23,6 @@ runs:
         patch -p1 < ${{ github.workspace }}/0003-fixes-for-mingw-gcc-12.patch
         popd
 
-#    - name: test-first
-#      shell: bash
-#      run: |
-#        ls -lah /usr/local/bin
-#        exit 1
-
     - name: test
       shell: bash
       run: |
@@ -61,31 +55,31 @@ runs:
         python --version
         pip install --upgrade setuptools
 
-#    ############ Build and Install MoltenVK ##############
-#    - name: Build MoltenVK
-#      shell: bash
-#      run: |
-#        pushd ${{ inputs.crossover-source }}/moltenvk
-#        ./fetchDependencies --macos
-#        make macos
-#        popd
-#
-#    - name: Install MoltenVK
-#      shell: bash
-#      run: |
-#        set -x
-#
-#        pushd ${{ inputs.crossover-source }}/moltenvk/Package/Latest/MoltenVK
-#        mkdir -p ${{ inputs.install-prefix }}/usr/local/lib/
-#        cp ./dylib/macOS/*.dylib ${{ inputs.install-prefix }}/usr/local/lib/
-#        cp -r ./include ${{ inputs.install-prefix }}/usr/local/
-#        popd
-#
-#        # also copy the spirv-headers as VKD3D seems to need them for building
-#        pushd ${{ inputs.crossover-source }}/moltenvk/External/glslang/External/spirv-tools/external/spirv-headers/include/
-#        cp -r ./spirv ${{ inputs.install-prefix }}/usr/local/include/
-#
-#        popd
+    ############ Build and Install MoltenVK ##############
+    - name: Build MoltenVK
+      shell: bash
+      run: |
+        pushd ${{ inputs.crossover-source }}/moltenvk
+        ./fetchDependencies --macos
+        make macos
+        popd
+
+    - name: Install MoltenVK
+      shell: bash
+      run: |
+        set -x
+
+        pushd ${{ inputs.crossover-source }}/moltenvk/Package/Latest/MoltenVK
+        mkdir -p ${{ inputs.install-prefix }}/usr/local/lib/
+        cp ./dylib/macOS/*.dylib ${{ inputs.install-prefix }}/usr/local/lib/
+        cp -r ./include ${{ inputs.install-prefix }}/usr/local/
+        popd
+
+        # also copy the spirv-headers as VKD3D seems to need them for building
+        pushd ${{ inputs.crossover-source }}/moltenvk/External/glslang/External/spirv-tools/external/spirv-headers/include/
+        cp -r ./spirv ${{ inputs.install-prefix }}/usr/local/include/
+
+        popd
 
     ############ Build and Install DXVK ##############
     - name: Get latest HomeBrew formulas/bottles