Skip to content

Commit

Permalink
Update kmake and the workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
RobDangerous committed Feb 22, 2025
1 parent 6744bac commit 6512631
Show file tree
Hide file tree
Showing 24 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/android-opengl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ jobs:
- name: Get Submodules
run: ./get_dlc
- name: Compile
run: ./make android -g opengl --kinc . --from Tests/Empty --compile
run: ./make android -g opengl --kore . --from Tests/Empty --compile
2 changes: 1 addition & 1 deletion .github/workflows/android-vulkan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ jobs:
- name: Get Submodules
run: ./get_dlc
- name: Compile
run: ./make android -g vulkan --kinc . --from Tests/Empty --compile
run: ./make android -g vulkan --kore . --from Tests/Empty --compile
2 changes: 1 addition & 1 deletion .github/workflows/doxygen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Create documentation
run: doxygen Doxyfile
- name: Clone website
run: git clone -b gh-pages https://github.com/Kode/Kinc.git Kinc-pages
run: git clone -b gh-pages https://github.com/Kode/Kore.git Kinc-pages
- name: Remove old documentation
run: rm -r Kinc-pages/api
- name: Copy new documentation
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/emscripten-webgl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ jobs:
- name: Get Submodules
run: ./get_dlc
- name: Compile (kmake)
run: ./make emscripten --kinc . --from Tests/Empty
run: ./make emscripten --kore . --from Tests/Empty
- name: Compile (emscripten)
run: git clone https://github.com/emscripten-core/emsdk.git && cd emsdk && ./emsdk install latest && ./emsdk activate latest && source ./emsdk_env.sh && cd ../build/Release && ninja
2 changes: 1 addition & 1 deletion .github/workflows/emscripten-webgpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ jobs:
- name: Get Submodules
run: ./get_dlc
- name: Compile (kmake)
run: ./make emscripten -g webgpu --kinc . --from Tests/Empty
run: ./make emscripten -g webgpu --kore . --from Tests/Empty
- name: Compile (emscripten)
run: git clone https://github.com/emscripten-core/emsdk.git && cd emsdk && ./emsdk install latest && ./emsdk activate latest && source ./emsdk_env.sh && cd ../build/Release && ninja
2 changes: 1 addition & 1 deletion .github/workflows/ios-metal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ jobs:
- name: Get Submodules
run: ./get_dlc
- name: Compile
run: ./make ios -g metal --kinc . --from Tests/Empty --nosigning --compile
run: ./make ios -g metal --kore . --from Tests/Empty --nosigning --compile
2 changes: 1 addition & 1 deletion .github/workflows/ios-opengl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ jobs:
- name: Get Submodules
run: ./get_dlc
- name: Compile
run: ./make ios -g opengl --kinc . --from Tests/Empty --nosigning --compile
run: ./make ios -g opengl --kore . --from Tests/Empty --nosigning --compile
6 changes: 3 additions & 3 deletions .github/workflows/linux-arm-opengl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
- name: Get Submodules
run: ./get_dlc
- name: Compile
run: ./make -g opengl --kinc . --from Tests/Empty --compile
run: ./make -g opengl --kore . --from Tests/Empty --compile
- name: Clean
run: rm -r build
- name: Get ImageMagick and xvfb
run: sudo apt install imagemagick xvfb
- name: Compile Test 1
run: ./make -g opengl --kinc . --from Tests/Shader --compile
run: ./make -g opengl --kore . --from Tests/Shader --compile
- name: Copy Test 1
run: cp build/Release/ShaderTest Tests/Shader/Deployment/ShaderTest
- name: Run Test 1
Expand All @@ -37,7 +37,7 @@ jobs:
- name: Check Test 1
run: compare-im6 -metric mae Tests/Shader/reference.png Tests/Shader/Deployment/test.png difference.png
- name: Compile Test 2 (SIMD)
run: ./make -g opengl --kinc . --from Tests/SIMD --compile
run: ./make -g opengl --kore . --from Tests/SIMD --compile
- name: Copy Test 2
run: cp build/Release/SIMD Tests/SIMD/Deployment/SIMD
- name: Run Test 2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/linux-opengl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
- name: Get Submodules
run: ./get_dlc
- name: Compile
run: ./make -g opengl --kinc . --from Tests/Empty --compile
run: ./make -g opengl --kore . --from Tests/Empty --compile
- name: Clean
run: rm -r build
- name: Get ImageMagick and xvfb
run: sudo apt install imagemagick xvfb
- name: Compile Test 1
run: ./make -g opengl --kinc . --from Tests/Shader --compile
run: ./make -g opengl --kore . --from Tests/Shader --compile
- name: Copy Test 1
run: cp build/Release/ShaderTest Tests/Shader/Deployment/ShaderTest
- name: Run Test 1
Expand All @@ -37,7 +37,7 @@ jobs:
- name: Check Test 1
run: compare-im6 -metric mae Tests/Shader/reference.png Tests/Shader/Deployment/test.png difference.png
- name: Compile Test 2 (SIMD)
run: ./make -g opengl --kinc . --from Tests/SIMD --compile
run: ./make -g opengl --kore . --from Tests/SIMD --compile
- name: Copy Test 2
run: cp build/Release/SIMD Tests/SIMD/Deployment/SIMD
- name: Run Test 2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux-vulkan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ jobs:
- name: Get Submodules
run: ./get_dlc
- name: Compile
run: ./make -g vulkan --kinc . --from Tests/Empty --compile
run: ./make -g vulkan --kore . --from Tests/Empty --compile
4 changes: 2 additions & 2 deletions .github/workflows/macos-metal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ jobs:
- name: Get Submodules
run: ./get_dlc
- name: Compile
run: ./make -g metal --kinc . --from Tests/Empty --compile
run: ./make -g metal --kore . --from Tests/Empty --compile
- name: Compile and Run Test 2 (SIMD)
run: ./make --kinc . --from Tests/SIMD --run
run: ./make --kore . --from Tests/SIMD --run
2 changes: 1 addition & 1 deletion .github/workflows/macos-opengl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ jobs:
- name: Get Submodules
run: ./get_dlc
- name: Compile
run: ./make -g opengl --kinc . --from Tests/Empty --compile
run: ./make -g opengl --kore . --from Tests/Empty --compile
2 changes: 1 addition & 1 deletion .github/workflows/uwp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ jobs:
- name: Get Submodules
run: .\get_dlc.bat
- name: Compile
run: .\make.bat windowsapp -v vs2022 --kinc . --from Tests/Empty --compile
run: .\make.bat windowsapp -v vs2022 --kore . --from Tests/Empty --compile
2 changes: 1 addition & 1 deletion .github/workflows/wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ jobs:
- name: Get Submodules
run: ./get_dlc
- name: Compile
run: ./make wasm --kinc . --from Tests/Empty --compile
run: ./make wasm --kore . --from Tests/Empty --compile
6 changes: 3 additions & 3 deletions .github/workflows/windows-direct3d11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ jobs:
- name: Get Submodules
run: .\get_dlc.bat
- name: Compile
run: .\make.bat -v vs2022 -g direct3d11 --kinc . --from Tests/Empty --compile
run: .\make.bat -v vs2022 -g direct3d11 --kore . --from Tests/Empty --compile
- name: Get ImageMagick
run: |
choco install -y imagemagick.app --no-progress
Get-ChildItem -Path "${env:ProgramFiles}" | Where-Object {($_.Name -Like 'ImageMagick*')} | % { $_.FullName } | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
- name: Compile and run Test 1
run: .\make.bat -v vs2022 -g direct3d11 --kinc . --from Tests/Shader --run
run: .\make.bat -v vs2022 -g direct3d11 --kore . --from Tests/Shader --run
- name: Check Test 1
run: magick compare -metric mae .\Tests\Shader\reference.png .\Tests\Shader\Deployment\test.png difference.png
- name: Compile and run Test 2 (SIMD)
run: .\make.bat -v vs2022 --kinc . --from Tests/SIMD --compile --run
run: .\make.bat -v vs2022 --kore . --from Tests/SIMD --compile --run
2 changes: 1 addition & 1 deletion .github/workflows/windows-direct3d12.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ jobs:
- name: Get Submodules
run: .\get_dlc.bat
- name: Compile
run: .\make.bat -v vs2022 -g direct3d12 --kinc . --from Tests/Empty --compile
run: .\make.bat -v vs2022 -g direct3d12 --kore . --from Tests/Empty --compile
2 changes: 1 addition & 1 deletion .github/workflows/windows-direct3d9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ jobs:
- name: Install DirectX
run: choco install -y directx --no-progress
- name: Compile
run: .\make.bat -v vs2022 -g direct3d9 -a directsound --kinc . --from Tests/Empty --compile
run: .\make.bat -v vs2022 -g direct3d9 -a directsound --kore . --from Tests/Empty --compile
2 changes: 1 addition & 1 deletion .github/workflows/windows-opengl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ jobs:
- name: Get Submodules
run: .\get_dlc.bat
- name: Compile
run: .\make.bat -v vs2022 -g opengl --kinc . --from Tests/Empty --compile
run: .\make.bat -v vs2022 -g opengl --kore . --from Tests/Empty --compile
2 changes: 1 addition & 1 deletion .github/workflows/windows-vulkan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ jobs:
- name: Get Submodules
run: .\get_dlc.bat
- name: Compile
run: .\make.bat -v vs2022 -g vulkan --kinc . --from Tests/Empty --compile
run: .\make.bat -v vs2022 -g vulkan --kore . --from Tests/Empty --compile
env:
VULKAN_SDK: C:\VulkanSDK\1.3.275.0
2 changes: 1 addition & 1 deletion Tools/linux_arm
Submodule linux_arm updated 1 files
+ kmake
2 changes: 1 addition & 1 deletion Tools/linux_arm64
Submodule linux_arm64 updated 1 files
+ kmake
2 changes: 1 addition & 1 deletion Tools/linux_x64
Submodule linux_x64 updated 1 files
+ kmake
2 changes: 1 addition & 1 deletion Tools/macos
Submodule macos updated 1 files
+ kmake
2 changes: 1 addition & 1 deletion Tools/windows_x64
Submodule windows_x64 updated 1 files
+ kmake.exe

0 comments on commit 6512631

Please sign in to comment.