Skip to content

Commit ca5c1c3

Browse files
committed
Revert "Update vcpkg.json to restrict dependencies to Windows platform and fix classic mode installation"
This reverts commit 46cc682.
1 parent 701121f commit ca5c1c3

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

attachments/simple_engine/install_dependencies_windows.bat

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,9 @@ set VCPKG_BINARY_SOURCES=clear;files,%TEMP%\vcpkg-cache,readwrite
2424
:: Create cache directory if it doesn't exist
2525
if not exist %TEMP%\vcpkg-cache mkdir %TEMP%\vcpkg-cache
2626

27-
:: Install all dependencies at once using vcpkg in classic mode by pointing to an empty manifest root
27+
:: Install all dependencies at once using vcpkg in classic mode
2828
echo Installing all dependencies...
29-
if not exist %TEMP%\vcpkg-classic-mode mkdir %TEMP%\vcpkg-classic-mode
30-
vcpkg install glfw3 glm tinyobjloader stb tinygltf nlohmann-json ktx[vulkan] openal-soft --triplet=x64-windows --x-manifest-root=%TEMP%\vcpkg-classic-mode
31-
rmdir %TEMP%\vcpkg-classic-mode
29+
vcpkg install glfw3 glm tinyobjloader stb tinygltf nlohmann-json ktx[vulkan] openal-soft --triplet=x64-windows
3230

3331
:: Remind about Vulkan SDK
3432
echo.
Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
{
2-
"name": "simple-engine",
2+
"name": "vulkan-game-engine-tutorial",
33
"version": "1.0.0",
44
"dependencies": [
5-
{ "name": "glfw3", "platform": "windows" },
6-
{ "name": "glm", "platform": "windows" },
7-
{ "name": "openal-soft", "platform": "windows" },
8-
{ "name": "tinygltf", "platform": "windows" },
9-
{ "name": "nlohmann-json", "platform": "windows" },
5+
{
6+
"name": "glfw3",
7+
"platform": "!android"
8+
},
9+
"glm",
10+
"openal-soft",
1011
{
1112
"name": "ktx",
12-
"platform": "windows",
1313
"features": [ "vulkan" ]
14-
}
14+
},
15+
"tinygltf",
16+
"nlohmann-json"
1517
]
1618
}

0 commit comments

Comments
 (0)