Update to latest vcpkg (2023.12.12)

CMakeLists.txt

@@ -61,9 +61,11 @@ find_package(SDL2 CONFIG REQUIRED)
 
 if (VCPKG_TARGET_TRIPLET)
 	# On Windows and MacOS we can use vcpkg to build all the dependencies.
-	find_path(SDL2_INCLUDE_DIR SDL2/SDL.h NO_SYSTEM_ENVIRONMENT_PATH)
-	find_package(SDL2-mixer CONFIG REQUIRED)
-	set(SDL2_ALL_LIBRARIES SDL2::SDL2main SDL2::SDL2-static SDL2::SDL2_mixer)
+	find_package(SDL2_mixer CONFIG REQUIRED)
+	set(SDL2_ALL_LIBRARIES 
+		$<TARGET_NAME_IF_EXISTS:SDL2::SDL2main>
+        $<IF:$<TARGET_EXISTS:SDL2::SDL2>,SDL2::SDL2,SDL2::SDL2-static> 
+		$<IF:$<TARGET_EXISTS:SDL2_mixer::SDL2_mixer>,SDL2_mixer::SDL2_mixer,SDL2_mixer::SDL2_mixer-static>)
 else()
 	# On Linux we have to rely on the package system (e.g. apt-get).
 	# Otherwise we are likely to be missing some SDL-mixer components (e.g. proper MIDI sound support).

Engine/src/sdl_util.h

@@ -11,7 +11,7 @@
 #pragma once
 
 #include <assert.h>
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include "build.h"
 
 // This will output the proper SDL error strings in the event that a SDL call returns an error

vcpkg_macosx.sh

@@ -5,7 +5,7 @@ mkdir -p build
 cd build
 git clone https://github.com/Microsoft/vcpkg.git vcpkg.macosx
 cd vcpkg.macosx
-git checkout 2022.05.10
+git checkout 2023.12.12
 ./bootstrap-vcpkg.sh
 
 ./vcpkg install \

vcpkg_windows_x64.bat

@@ -2,7 +2,7 @@ mkdir build
 cd build || goto :error
 git clone https://github.com/Microsoft/vcpkg.git vcpkg.windows.x64 || goto :error
 cd vcpkg.windows.x64 || goto :error
-git checkout 2022.05.10 || goto :error
+git checkout 2023.12.12 || goto :error
 call bootstrap-vcpkg.bat || goto :error
 
 vcpkg.exe install ^

vcpkg_windows_x86.bat

@@ -2,7 +2,7 @@ mkdir build
 cd build || goto :error
 git clone https://github.com/Microsoft/vcpkg.git vcpkg.windows.x86 || goto :error
 cd vcpkg.windows.x86 || goto :error
-git checkout 2022.05.10 || goto :error
+git checkout 2023.12.12 || goto :error
 call bootstrap-vcpkg.bat || goto :error
 
 vcpkg.exe install ^