Skip to content
Merged

Dev #224

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
- name: Compile gkNextRenderer
run: |
slangc -v
./build.sh ios-release
./build.sh --preset default-ios

- name: Save vcpkg to cache
if: github.event_name != 'pull_request'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
key: ${{ runner.os }}-desktop-bincache

- name: Compile gkNextRenderer
run: ./build.sh --preset linux-release
run: ./build.sh --preset default-linux

- name: Save vcpkg to cache
if: github.event_name != 'pull_request'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
- name: Compile gkNextRenderer
run: |
slangc -v
./build.sh --preset macos-arm64
./build.sh --preset default-macos-arm64

- name: Save vcpkg to cache
if: github.event_name != 'pull_request'
Expand Down
23 changes: 11 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
java-version: '21'
- uses: actions/checkout@v4
- name: Compile vcpkg dependencies
run: ./vcpkg_android.sh
run: ./vcpkg.sh android
- name: Install Vulkan SDK
run: |
wget -qO - http://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
Expand All @@ -44,8 +44,7 @@ jobs:
- name: Compile gkNextRenderer
run: |
echo "BUILDVER(${{ github.ref_name }})" > src/build.version
./build_android.sh
./build_android.sh
./build.sh --android
- name: Create zip file
run: |
zip -r gknextrenderer_android_${{ github.ref_name }}.zip ./android/app/build/outputs/apk/release/app-release.apk ./deploy_android.bat
Expand Down Expand Up @@ -78,20 +77,20 @@ jobs:
- name: Compile vcpkg dependencies
run: |
echo "BUILDVER(${{ github.ref_name }})" > src/build.version
./vcpkg_linux.sh
./vcpkg.sh linux
- name: Compile gkNextRenderer
run: ./build_linux.sh
run: ./build.sh --preset default-linux
- name: Create zip file
run: |
cd build/linux
cd out/build/default-linux
zip -r gknextrenderer_linux64_${{ github.ref_name }}.zip ./bin ./assets/locale ./assets/fonts ./assets/models ./assets/shaders ./assets/textures
- name: Upload Release Asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.make-release.outputs.uploadurl }}
asset_path: ./build/linux/gknextrenderer_linux64_${{ github.ref_name }}.zip
asset_path: ./out/build/default-linux/gknextrenderer_linux64_${{ github.ref_name }}.zip
asset_name: gknextrenderer_linux64_${{ github.ref_name }}.zip
asset_content_type: application/zip
windows-build:
Expand All @@ -111,27 +110,27 @@ jobs:
- name: Compile vcpkg dependencies
run: |
set VULKAN_SDK=C:\VulkanSDK\%SDK_VERSION%
vcpkg_windows.bat
vcpkg.bat
shell: cmd
- name: Setup MSBuild
uses: microsoft/setup-msbuild@v2
- name: Compile gkNextRenderer
run: |
set VULKAN_SDK=C:\VulkanSDK\%SDK_VERSION%
echo BUILDVER(${{ github.ref_name }}) > src/build.version
build_windows.bat
build.bat --preset default-windows
shell: cmd
- name: Create zip file
run: |
cd build/windows
Copy-Item -Path ..\..\package\*.bat -Destination .
cd out/build/default-windows
Copy-Item -Path ..\..\..\package\*.bat -Destination .
zip -r gknextrenderer_win64_${{ github.ref_name }}.zip ./bin ./assets/locale ./assets/fonts ./assets/models ./assets/shaders ./assets/textures ./*.bat
- name: Upload Release Asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.make-release.outputs.uploadurl }}
asset_path: ./build/windows/gknextrenderer_win64_${{ github.ref_name }}.zip
asset_path: ./out/build/default-windows/gknextrenderer_win64_${{ github.ref_name }}.zip
asset_name: gknextrenderer_win64_${{ github.ref_name }}.zip
asset_content_type: application/zip
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- name: Compile gkNextRenderer
run: |
set VULKAN_SDK=C:\VulkanSDK\%SDK_VERSION%
build.bat --preset windows-dev
build.bat --preset default-windows
shell: cmd

- name: Save vcpkg to cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows_self.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ jobs:

- name: Compile gkNextRenderer
run: |
build.bat --preset windows-dev
build.bat --preset default-windows
shell: cmd

3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
[Ll]og/
.vcpkg/
.vcpkg_bincache/
external/MoltenVK/
external/slang*/
external/
build/
build-*/
**/vcpkg_installed/
Expand Down
24 changes: 0 additions & 24 deletions .vscode/cmake-kits.json

This file was deleted.

13 changes: 13 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"version": "0.2.0",
"configurations": [
{
"type": "lldb",
"request": "launch",
"name": "Launch",
"program": "${command:cmake.launchTargetPath}",
"args": [],
"cwd": "${command:cmake.launchTargetDirectory}",
}
]
}
143 changes: 14 additions & 129 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,135 +12,20 @@
"**/.github/**",
"**/src/Application/**"
],
"files.exclude": {
"out": true,
".vcpkg": true,
".vcpkg_bincache": true,
".VSCodeCounter": true,
".idea": true,
".claude": true
},
"files.associations": {
"__split_buffer": "cpp",
"deque": "cpp",
"list": "cpp",
"string": "cpp",
"vector": "cpp",
"__bit_reference": "cpp",
"__config": "cpp",
"__debug": "cpp",
"__errc": "cpp",
"__hash_table": "cpp",
"__locale": "cpp",
"__mutex_base": "cpp",
"__node_handle": "cpp",
"__threading_support": "cpp",
"__tree": "cpp",
"__verbose_abort": "cpp",
"any": "cpp",
"array": "cpp",
"atomic": "cpp",
"barrier": "cpp",
"bitset": "cpp",
"cctype": "cpp",
"charconv": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"codecvt": "cpp",
"complex": "cpp",
"condition_variable": "cpp",
"csignal": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdint": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"exception": "cpp",
"coroutine": "cpp",
"forward_list": "cpp",
"fstream": "cpp",
"future": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"ios": "cpp",
"iosfwd": "cpp",
"iostream": "cpp",
"istream": "cpp",
"latch": "cpp",
"limits": "cpp",
"locale": "cpp",
"map": "cpp",
"mutex": "cpp",
"new": "cpp",
"numbers": "cpp",
"optional": "cpp",
"ostream": "cpp",
"queue": "cpp",
"ratio": "cpp",
"regex": "cpp",
"semaphore": "cpp",
"set": "cpp",
"shared_mutex": "cpp",
"source_location": "cpp",
"span": "cpp",
"sstream": "cpp",
"stack": "cpp",
"stdexcept": "cpp",
"streambuf": "cpp",
"string_view": "cpp",
"strstream": "cpp",
"system_error": "cpp",
"thread": "cpp",
"tuple": "cpp",
"typeindex": "cpp",
"typeinfo": "cpp",
"unordered_map": "cpp",
"unordered_set": "cpp",
"valarray": "cpp",
"variant": "cpp",
"algorithm": "cpp",
"bit": "cpp",
"*.tcc": "cpp",
"chrono": "cpp",
"cinttypes": "cpp",
"compare": "cpp",
"concepts": "cpp",
"expected": "cpp",
"functional": "cpp",
"iterator": "cpp",
"memory": "cpp",
"memory_resource": "cpp",
"numeric": "cpp",
"random": "cpp",
"type_traits": "cpp",
"utility": "cpp",
"format": "cpp",
"ranges": "cpp",
"stop_token": "cpp",
"cfenv": "cpp",
"filesystem": "cpp",
"execution": "cpp",
"print": "cpp",
"spanstream": "cpp",
"stacktrace": "cpp",
"stdfloat": "cpp",
"syncstream": "cpp",
"xfacet": "cpp",
"xhash": "cpp",
"xiosbase": "cpp",
"xlocale": "cpp",
"xlocbuf": "cpp",
"xlocinfo": "cpp",
"xlocmes": "cpp",
"xlocmon": "cpp",
"xlocnum": "cpp",
"xloctime": "cpp",
"xmemory": "cpp",
"xstring": "cpp",
"xtr1common": "cpp",
"xtree": "cpp",
"xutility": "cpp",
"slist": "cpp"
"*.cpp": "cpp",
"*.hpp": "cpp"
},
"glsllint.glslangValidatorArgs": ["-V"],
"cmake.buildDirectory": "${workspaceFolder}/build/windows-vscode",
"files.exclude": {
"build": true,
}
"cmake.debugConfig": {
"name": "CMake Debug (LLDB)"
},
"C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools"
}
Loading