Skip to content

Commit b7be40c

Browse files
committed
Merge branch 'main' into dependencies-add-direct-draw-and-play
2 parents d88f98e + d4125ca commit b7be40c

File tree

4 files changed

+4
-2
lines changed

4 files changed

+4
-2
lines changed

.github/workflows/cpp-linter.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ jobs:
2727
env:
2828
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2929
with:
30+
version: 21 # default is 18
31+
3032
style: 'file' # Use .clang-format config file.
3133
tidy-checks: '-*' # disable clang-tidy checks.
3234

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,5 @@ _original
5050
# Visual Studio Configuration
5151
.vs
5252

53-
# Allow the recreated static libs
54-
!dependencies/recreated/lib/*.lib
53+
# Allow dependency libs
54+
!dependencies/**/*.lib

dependencies/lua/lib/lua.lib

30.2 KB
Binary file not shown.

dependencies/ucp3/lib/ucp3.lib

4.74 KB
Binary file not shown.

0 commit comments

Comments
 (0)