Use vcpkg for all platform presets

Author: tophyr

.github/workflows/build.yml

@@ -66,22 +66,25 @@ jobs:
         run: |
           sudo apt update
           sudo apt install -y --no-install-recommends \
-            ninja-build cmake g++ libgtest-dev libsdl2-dev zlib1g-dev libspdlog-dev
+            ninja-build cmake g++ libspdlog-dev
 
       - name: Install Windows dependencies
         if: ${{ matrix.os.runner == 'windows-latest' }}
         run: choco install ninja
-      
+
       - uses: ilammy/msvc-dev-cmd@v1
         if: ${{ matrix.os.runner == 'windows-latest' }}
         with:
            arch: win64
 
+      - uses: lukka/run-vcpkg@v11
+        with:
+          vcpkgGitCommitId: 2e7fd315d713e9eac52f6bdb24afbf1b4dbbe1e5
+
       - name: Configure CMake
         env:
           CC: ${{ matrix.os.cc }}
           CXX: ${{ matrix.os.cxx }}
-          VCPKG_ROOT: C:/vcpkg
         run: cmake --preset ${{ matrix.os.preset }} -DBUILD_TESTING=ON -DENABLE_LOGGER=ON -DFORCE_PORTABLE_INSTALL=ON -DBUILD_EDITOR=ON
 
       - name: Build ${{ matrix.build_type }}

Brewfile

@@ -1,11 +1,4 @@
 # Homebrew dependencies to build Descent3
 
-# SDL
-brew "sdl2"
-
 brew "cmake"
-brew "googletest"
 brew "ninja"
-
-# zlib
-brew "zlib"

CMakePresets.json

@@ -4,7 +4,8 @@
 		{
 			"name": "defaults",
 			"hidden": true,
-			"binaryDir": "${sourceDir}/builds/${presetName}"
+			"binaryDir": "${sourceDir}/builds/${presetName}",
+			"toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
 		},
 		{
 			"name": "win",
@@ -21,8 +22,7 @@
 			"architecture": {
 				"strategy": "external",
 				"value": "x64"
-			},
-			"toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
+			}
 		},
 		{
 			"name": "mac",

README.md

@@ -92,6 +92,10 @@ The milestone needs testing on all platforms. Please report issues when found.
     - D3 Open Source compiles level scripts in their own hogfiles. Make sure you copy and overwrite `d3-{platform}.hog`.
 
 ## Building
+#### Prerequisites
+1. [**vcpkg**](https://github.com/microsoft/vcpkg)
+    This project depends on [`vcpkg`](https://github.com/microsoft/vcpkg), a cross-platform dependency-management system developed by Microsoft. You will need to install it locally by cloning https://github.com/microsoft/vcpkg and setting your `VCPKG_ROOT` env var to the repository location.
+
 #### Building - Windows
 1. Make sure that you have Git and Visual Studio 2022 with the “Desktop development with C++” workload. If you don’t already have those installed or you aren’t sure, then open an elevated Command Prompt and run:
 
@@ -146,7 +150,7 @@ Run these commands:
 
 ```sh
 sudo apt update
-sudo apt install -y --no-install-recommends git ninja-build cmake g++ libsdl2-dev zlib1g-dev
+sudo apt install -y --no-install-recommends git ninja-build cmake g++
 git clone https://github.com/DescentDevelopers/Descent3
 cd Descent3
 cmake --preset linux -D ENABLE_LOGGER=[ON|OFF]
@@ -160,7 +164,7 @@ Run these commands:
 
 ```sh
 sudo dnf update --refresh
-sudo dnf install -y git ninja-build cmake gcc-c++ SDL2-devel zlib-devel
+sudo dnf install -y git ninja-build cmake gcc-c++
 git clone https://github.com/DescentDevelopers/Descent3
 cd Descent3
 cmake --preset linux -D ENABLE_LOGGER=[ON|OFF]

vcpkg.json

@@ -5,7 +5,14 @@
     "zlib",
     {
       "name": "sdl2",
-      "version>=": "2.30.1"
+      "version>=": "2.30.1",
+      "features": ["x11","wayland"],
+      "platform": "linux"
+    },
+    {
+      "name": "sdl2",
+      "version>=": "2.30.1",
+      "platform": "!linux"
     }
   ]
 }