From 46a8590b7f1ed4cc9d13a8cc1921bc2742f5e9b0 Mon Sep 17 00:00:00 2001 From: scawful Date: Sun, 28 Sep 2025 16:19:42 -0400 Subject: [PATCH] Update YAZE project configuration to switch to dynamic library linkage and adjust SDL2 dependencies - Modified the `YAZE.vcxproj` file to change the Vcpkg triplet settings for Windows platforms from static to dynamic. - Updated the `AdditionalDependencies` for various configurations to use dynamic versions of SDL2 libraries, enhancing compatibility and reducing build complexity. - Adjusted the `cmake/vcpkg.cmake` file to reflect the change in library linkage, ensuring consistent behavior across builds. --- YAZE.vcxproj | 18 +++++++++--------- cmake/vcpkg.cmake | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/YAZE.vcxproj b/YAZE.vcxproj index 320016d2..c73017e5 100644 --- a/YAZE.vcxproj +++ b/YAZE.vcxproj @@ -2,9 +2,9 @@ true - x86-windows-static - x64-windows-static - arm64-windows-static + x86-windows + x64-windows + arm64-windows @@ -147,7 +147,7 @@ Console true $(ProjectDir)build\lib\$(Configuration);$(ProjectDir)build\src\lib\asar\src\asar\lib\$(Configuration);%(AdditionalLibraryDirectories) - SDL2-static.lib;SDL2main.lib;asar-static.lib;ImGui.lib;%(AdditionalDependencies) + SDL2.lib;SDL2main.lib;asar-static.lib;ImGui.lib;%(AdditionalDependencies) @@ -168,7 +168,7 @@ true true $(ProjectDir)build\lib\$(Configuration);$(ProjectDir)build\src\lib\asar\src\asar\lib\$(Configuration);%(AdditionalLibraryDirectories) - SDL2-static.lib;SDL2main.lib;asar-static.lib;ImGui.lib;%(AdditionalDependencies) + SDL2.lib;SDL2main.lib;asar-static.lib;ImGui.lib;%(AdditionalDependencies) @@ -185,7 +185,7 @@ Console true $(ProjectDir)build\lib\$(Configuration);$(ProjectDir)build\src\lib\asar\src\asar\lib\$(Configuration);%(AdditionalLibraryDirectories) - SDL2-static.lib;SDL2main.lib;asar-static.lib;ImGui.lib;%(AdditionalDependencies) + SDL2.lib;SDL2main.lib;asar-static.lib;ImGui.lib;%(AdditionalDependencies) @@ -206,7 +206,7 @@ true true $(ProjectDir)build\lib\$(Configuration);$(ProjectDir)build\src\lib\asar\src\asar\lib\$(Configuration);%(AdditionalLibraryDirectories) - SDL2-static.lib;SDL2main.lib;asar-static.lib;ImGui.lib;%(AdditionalDependencies) + SDL2.lib;SDL2main.lib;asar-static.lib;ImGui.lib;%(AdditionalDependencies) @@ -223,7 +223,7 @@ Console true $(ProjectDir)build\lib\$(Configuration);$(ProjectDir)build\src\lib\asar\src\asar\lib\$(Configuration);%(AdditionalLibraryDirectories) - SDL2-static.lib;SDL2main.lib;asar-static.lib;ImGui.lib;%(AdditionalDependencies) + SDL2.lib;SDL2main.lib;asar-static.lib;ImGui.lib;%(AdditionalDependencies) @@ -244,7 +244,7 @@ true true $(ProjectDir)build\lib\$(Configuration);$(ProjectDir)build\src\lib\asar\src\asar\lib\$(Configuration);%(AdditionalLibraryDirectories) - SDL2-static.lib;SDL2main.lib;asar-static.lib;ImGui.lib;%(AdditionalDependencies) + SDL2.lib;SDL2main.lib;asar-static.lib;ImGui.lib;%(AdditionalDependencies) diff --git a/cmake/vcpkg.cmake b/cmake/vcpkg.cmake index f6df7700..8fcf265f 100644 --- a/cmake/vcpkg.cmake +++ b/cmake/vcpkg.cmake @@ -4,7 +4,7 @@ add_definitions("-DMICROSOFT_WINDOWS_WINBASE_H_DEFINE_INTERLOCKED_CPLUSPLUS_OVER # vcpkg settings set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE dynamic) # Enable vcpkg manifest mode for automatic dependency management set(VCPKG_MANIFEST_MODE ON)