Skip to content

Commit 84400ff

Browse files
committed
Add OpenAL and Vulkan dependencies and streamline CI dependency installation
1 parent a2ae4a6 commit 84400ff

2 files changed

Lines changed: 7 additions & 11 deletions

File tree

.github/workflows/simple_engine.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ jobs:
6666
libxinerama-dev \
6767
libxcursor-dev \
6868
libxi-dev \
69-
libopenal-dev \
70-
libktx-dev
69+
libopenal-dev
7170
7271
- name: Install project deps via script (Ubuntu)
7372
if: matrix.os == 'ubuntu-latest'
@@ -87,13 +86,8 @@ jobs:
8786
git clone https://github.com/microsoft/vcpkg.git $env:USERPROFILE\vcpkg
8887
& $env:USERPROFILE\vcpkg\bootstrap-vcpkg.bat
8988
$triplet = 'x64-windows'
90-
& $env:USERPROFILE\vcpkg\vcpkg.exe install `
91-
vulkan:${triplet} `
92-
glfw3:${triplet} `
93-
glm:${triplet} `
94-
tinygltf:${triplet} `
95-
ktx:${triplet} `
96-
openal-soft:${triplet}
89+
# Use manifest mode; vcpkg.json at repo root defines dependencies
90+
& $env:USERPROFILE\vcpkg\vcpkg.exe install --triplet $triplet
9791
echo "CMAKE_TOOLCHAIN_FILE=$env:USERPROFILE\vcpkg\scripts\buildsystems\vcpkg.cmake" >> $env:GITHUB_ENV
9892
echo "VCPKG_TARGET_TRIPLET=$triplet" >> $env:GITHUB_ENV
9993
@@ -102,7 +96,7 @@ jobs:
10296
shell: cmd
10397
working-directory: attachments/simple_engine
10498
run: |
105-
if exist install_dependencies_windows.bat call install_dependencies_windows.bat
99+
if exist install_dependencies_windows.bat call install_dependencies_windows.bat || exit /b 0
106100
107101
# -----------------------
108102
# Configure & Build

vcpkg.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
"stb",
99
"tinygltf",
1010
"nlohmann-json",
11-
"ktx"
11+
"ktx",
12+
"openal-soft",
13+
"vulkan"
1214
]
1315
}

0 commit comments

Comments
 (0)