Skip to content

Commit

Permalink
Merge branch 'main' into scene.hpp-improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
vorlac authored Jun 1, 2024
2 parents 8e48456 + a027cca commit 45ac25b
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 32 deletions.
16 changes: 0 additions & 16 deletions .github/workflows/cmake-multi-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,3 @@ jobs:
run: cmake --build ${{ github.workspace }}/.out --config Debug --target clean --parallel 48
- name: '[linux | gcc] => cmake - build'
run: cmake --build ${{ github.workspace }}/.out --config Debug --target roguelite --parallel 48

# linux / clang build
- name: '[linux | clang] => cmake - delete cache'
run: rm -rf ${{ github.workspace }}/.out/*
- name: '[linux | clang] => cmake - configure'
run: >
cmake -B ${{ github.workspace }}/.out
-DCMAKE_CXX_COMPILER=clang++
-DCMAKE_C_COMPILER=clang
-DCMAKE_BUILD_TYPE=Debug
-S ${{ github.workspace }}
-G Ninja
- name: '[linux | clang] => cmake - clean'
run: cmake --build ${{ github.workspace }}/.out --config Debug --target clean --parallel 48
- name: '[linux | clang] => cmake - build'
run: cmake --build ${{ github.workspace }}/.out --config Debug --target roguelite --parallel 48
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[submodule "engine"]
[submodule "extern/godot-engine"]
path = extern/godot-engine
url = https://github.com/godotengine/godot.git
branch = 4.2
[submodule "godot/godot-cpp"]
[submodule "extern/godot-cpp"]
path = extern/godot-cpp
url = https://github.com/godotengine/godot-cpp.git
branch = 4.2
Expand Down
14 changes: 0 additions & 14 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,7 @@
{
"recommendations": [
"ms-vscode.cpptools",
"twxs.cmake",
"josetr.cmake-language-support-vscode",
"ms-vscode.cmake-tools",
"eamodio.gitlens",
"alfish.godot-files",
"ms-python.python",
"ms-vscode-remote.remote-ssh",
"ms-vscode.remote-explorer",
"yzhang.markdown-all-in-one",
"foxundermoon.shell-format",
"calro.vscode-theme-one-dark-muted",
"jeff-hykin.better-cpp-syntax",
"ibm.output-colorizer",
"xaver.clang-format",
"bierner.docs-view",
"donjayamanne.githistory"
]
}

0 comments on commit 45ac25b

Please sign in to comment.