diff --git a/CMakeModules/DuckStationDependencies.cmake b/CMakeModules/DuckStationDependencies.cmake
index e8f7dbae4..7b2f02d7d 100644
--- a/CMakeModules/DuckStationDependencies.cmake
+++ b/CMakeModules/DuckStationDependencies.cmake
@@ -9,11 +9,11 @@ if(NOT WIN32 AND NOT ANDROID)
set(CMAKE_FIND_FRAMEWORK NEVER)
endif()
- find_package(Zstd REQUIRED)
- find_package(WebP REQUIRED)
- find_package(ZLIB REQUIRED)
- find_package(PNG REQUIRED)
- find_package(JPEG REQUIRED)
+ find_package(Zstd 1.5.5 REQUIRED)
+ find_package(WebP REQUIRED) # v1.3.2, spews an error on Linux because no pkg-config.
+ find_package(ZLIB 1.3 REQUIRED)
+ find_package(PNG 1.6.40 REQUIRED)
+ find_package(JPEG REQUIRED) # No version because flatpak uses libjpeg-turbo.
find_package(CURL REQUIRED)
if(APPLE)
set(CMAKE_FIND_FRAMEWORK ${FIND_FRAMEWORK_BACKUP})
diff --git a/dep/libchdr/libchdr.vcxproj b/dep/libchdr/libchdr.vcxproj
index 7fbee67dc..3d7540b44 100644
--- a/dep/libchdr/libchdr.vcxproj
+++ b/dep/libchdr/libchdr.vcxproj
@@ -5,12 +5,6 @@
{dd944834-7899-4c1c-a4c1-064b5009d239}
-
- {7ff9fdb9-d504-47db-a16a-b08071999620}
-
-
- {73ee0c55-6ffe-44e7-9c12-baa52434a797}
-
@@ -36,7 +30,7 @@
TurnOffAllWarnings
- $(SolutionDir)dep\zlib\include;$(SolutionDir)dep\lzma\include;$(SolutionDir)dep\zstd\lib;$(ProjectDir)include;%(AdditionalIncludeDirectories)
+ $(ProjectDir)include;%(AdditionalIncludeDirectories);$(SolutionDir)dep\lzma\include
diff --git a/dep/minizip/minizip.vcxproj b/dep/minizip/minizip.vcxproj
index be537b765..c5aea5ede 100644
--- a/dep/minizip/minizip.vcxproj
+++ b/dep/minizip/minizip.vcxproj
@@ -16,11 +16,6 @@
-
-
- {7ff9fdb9-d504-47db-a16a-b08071999620}
-
-
{8BDA439C-6358-45FB-9994-2FF083BABE06}
diff --git a/dep/msvc/vsprops/Base.props b/dep/msvc/vsprops/Base.props
index 58b170762..7a7eda29e 100644
--- a/dep/msvc/vsprops/Base.props
+++ b/dep/msvc/vsprops/Base.props
@@ -1,5 +1,14 @@
+
+
+ $(SolutionDir)dep\msvc\deps-x64\
+ $(SolutionDir)dep\msvc\deps-arm64\
+ $(DepsRootDir)bin\
+ $(DepsRootDir)lib\
+ $(DepsRootDir)include\
+
+
true
@@ -19,6 +28,7 @@
stdcpp17
true
_HAS_EXCEPTIONS=0;_CRT_INTERNAL_NONSTDC_NAMES;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions)
+ %(AdditionalIncludeDirectories);$(DepsIncludeDir)
/Zc:__cplusplus /Zo /utf-8 %(AdditionalOptions)
-flto=thin %(AdditionalOptions)
@@ -26,6 +36,7 @@
true
+ %(AdditionalLibraryDirectories);$(DepsLibDir)
diff --git a/dep/msvc/vsprops/BaseApplication.props b/dep/msvc/vsprops/BaseApplication.props
index 6cc71932f..4e6f5a414 100644
--- a/dep/msvc/vsprops/BaseApplication.props
+++ b/dep/msvc/vsprops/BaseApplication.props
@@ -1,6 +1,6 @@
-
+
$(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\
$(SolutionDir)bin\$(Platform)\
false
diff --git a/dep/msvc/vsprops/SDL2Compile.props b/dep/msvc/vsprops/SDL2Compile.props
deleted file mode 100644
index aa5f760fd..000000000
--- a/dep/msvc/vsprops/SDL2Compile.props
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
- $(SolutionDir)bin\$(Platform)\
- $(SolutionDir)dep\msvc\sdl2\
- $(SolutionDir)dep\msvc\deps-x64\
- $(SolutionDir)dep\msvc\deps-arm64\
-
- d
-
-
-
- $(SDL2Dir)include\SDL2;%(AdditionalIncludeDirectories)
-
-
- $(SDL2Dir)lib;%(AdditionalLibraryDirectories)
- SDL2$(SDL2LibSuffix).lib;%(AdditionalDependencies)
-
-
- $(SDL2Dir)lib;%(AdditionalLibraryDirectories)
- SDL2$(SDL2LibSuffix).lib;%(AdditionalDependencies)
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/duckstation.sln b/duckstation.sln
index 496a19098..36b700d31 100644
--- a/duckstation.sln
+++ b/duckstation.sln
@@ -21,11 +21,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cubeb", "dep\cubeb\cubeb.vc
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "dep\minizip\minizip.vcxproj", "{8BDA439C-6358-45FB-9994-2FF083BABE06}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "dep\zlib\zlib.vcxproj", "{7FF9FDB9-D504-47DB-A16A-B08071999620}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchdr", "dep\libchdr\libchdr.vcxproj", "{425D6C99-D1C8-43C2-B8AC-4D7B1D941017}"
ProjectSection(ProjectDependencies) = postProject
- {7FF9FDB9-D504-47DB-A16A-B08071999620} = {7FF9FDB9-D504-47DB-A16A-B08071999620}
{DD944834-7899-4C1C-A4C1-064B5009D239} = {DD944834-7899-4C1C-A4C1-064B5009D239}
EndProjectSection
EndProject
@@ -61,8 +58,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "src\util\util.vcxpr
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soundtouch", "dep\soundtouch\soundtouch.vcxproj", "{751D9F62-881C-454E-BCE8-CB9CF5F1D22F}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zstd", "dep\zstd\zstd.vcxproj", "{73EE0C55-6FFE-44E7-9C12-BAA52434A797}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpuinfo", "dep\cpuinfo\cpuinfo.vcxproj", "{EE55AA65-EA6B-4861-810B-78354B53A807}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zydis", "dep\zydis\zydis.vcxproj", "{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}"
@@ -73,10 +68,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reshadefx", "dep\reshadefx\
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rapidyaml", "dep\rapidyaml\rapidyaml.vcxproj", "{1AD23A8A-4C20-434C-AE6B-0E07759EEB1E}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "dep\libpng\libpng.vcxproj", "{9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "dep\libjpeg\libjpeg.vcxproj", "{EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM64 = Debug|ARM64
@@ -349,38 +340,6 @@ Global
{8BDA439C-6358-45FB-9994-2FF083BABE06}.ReleaseLTCG-Clang|ARM64.Build.0 = ReleaseLTCG-Clang|ARM64
{8BDA439C-6358-45FB-9994-2FF083BABE06}.ReleaseLTCG-Clang|x64.ActiveCfg = ReleaseLTCG-Clang|x64
{8BDA439C-6358-45FB-9994-2FF083BABE06}.ReleaseLTCG-Clang|x64.Build.0 = ReleaseLTCG-Clang|x64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.Debug|ARM64.ActiveCfg = Debug|ARM64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.Debug|ARM64.Build.0 = Debug|ARM64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.Debug|x64.ActiveCfg = Debug|x64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.Debug|x64.Build.0 = Debug|x64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.Debug-Clang|ARM64.ActiveCfg = Debug-Clang|ARM64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.Debug-Clang|ARM64.Build.0 = Debug-Clang|ARM64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.Debug-Clang|x64.ActiveCfg = Debug-Clang|x64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.Debug-Clang|x64.Build.0 = Debug-Clang|x64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.DebugFast|ARM64.ActiveCfg = DebugFast|ARM64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.DebugFast|ARM64.Build.0 = DebugFast|ARM64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.DebugFast|x64.ActiveCfg = DebugFast|x64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.DebugFast|x64.Build.0 = DebugFast|x64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.DebugFast-Clang|ARM64.ActiveCfg = DebugFast-Clang|ARM64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.DebugFast-Clang|ARM64.Build.0 = DebugFast-Clang|ARM64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.DebugFast-Clang|x64.ActiveCfg = DebugFast-Clang|x64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.DebugFast-Clang|x64.Build.0 = DebugFast-Clang|x64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.Release|ARM64.ActiveCfg = Release|ARM64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.Release|ARM64.Build.0 = Release|ARM64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.Release|x64.ActiveCfg = Release|x64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.Release|x64.Build.0 = Release|x64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.Release-Clang|ARM64.ActiveCfg = Release-Clang|ARM64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.Release-Clang|ARM64.Build.0 = Release-Clang|ARM64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.Release-Clang|x64.ActiveCfg = Release-Clang|x64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.Release-Clang|x64.Build.0 = Release-Clang|x64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.ReleaseLTCG|ARM64.ActiveCfg = ReleaseLTCG|ARM64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.ReleaseLTCG|ARM64.Build.0 = ReleaseLTCG|ARM64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.ReleaseLTCG-Clang|ARM64.ActiveCfg = ReleaseLTCG-Clang|ARM64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.ReleaseLTCG-Clang|ARM64.Build.0 = ReleaseLTCG-Clang|ARM64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.ReleaseLTCG-Clang|x64.ActiveCfg = ReleaseLTCG-Clang|x64
- {7FF9FDB9-D504-47DB-A16A-B08071999620}.ReleaseLTCG-Clang|x64.Build.0 = ReleaseLTCG-Clang|x64
{425D6C99-D1C8-43C2-B8AC-4D7B1D941017}.Debug|ARM64.ActiveCfg = Debug|ARM64
{425D6C99-D1C8-43C2-B8AC-4D7B1D941017}.Debug|ARM64.Build.0 = Debug|ARM64
{425D6C99-D1C8-43C2-B8AC-4D7B1D941017}.Debug|x64.ActiveCfg = Debug|x64
@@ -855,38 +814,6 @@ Global
{751D9F62-881C-454E-BCE8-CB9CF5F1D22F}.ReleaseLTCG-Clang|ARM64.Build.0 = ReleaseLTCG-Clang|ARM64
{751D9F62-881C-454E-BCE8-CB9CF5F1D22F}.ReleaseLTCG-Clang|x64.ActiveCfg = ReleaseLTCG-Clang|x64
{751D9F62-881C-454E-BCE8-CB9CF5F1D22F}.ReleaseLTCG-Clang|x64.Build.0 = ReleaseLTCG-Clang|x64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.Debug|ARM64.ActiveCfg = Debug|ARM64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.Debug|ARM64.Build.0 = Debug|ARM64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.Debug|x64.ActiveCfg = Debug|x64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.Debug|x64.Build.0 = Debug|x64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.Debug-Clang|ARM64.ActiveCfg = Debug-Clang|ARM64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.Debug-Clang|ARM64.Build.0 = Debug-Clang|ARM64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.Debug-Clang|x64.ActiveCfg = Debug-Clang|x64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.Debug-Clang|x64.Build.0 = Debug-Clang|x64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.DebugFast|ARM64.ActiveCfg = DebugFast|ARM64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.DebugFast|ARM64.Build.0 = DebugFast|ARM64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.DebugFast|x64.ActiveCfg = DebugFast|x64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.DebugFast|x64.Build.0 = DebugFast|x64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.DebugFast-Clang|ARM64.ActiveCfg = DebugFast-Clang|ARM64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.DebugFast-Clang|ARM64.Build.0 = DebugFast-Clang|ARM64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.DebugFast-Clang|x64.ActiveCfg = DebugFast-Clang|x64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.DebugFast-Clang|x64.Build.0 = DebugFast-Clang|x64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.Release|ARM64.ActiveCfg = Release|ARM64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.Release|ARM64.Build.0 = Release|ARM64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.Release|x64.ActiveCfg = Release|x64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.Release|x64.Build.0 = Release|x64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.Release-Clang|ARM64.ActiveCfg = Release-Clang|ARM64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.Release-Clang|ARM64.Build.0 = Release-Clang|ARM64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.Release-Clang|x64.ActiveCfg = Release-Clang|x64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.Release-Clang|x64.Build.0 = Release-Clang|x64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.ReleaseLTCG|ARM64.ActiveCfg = ReleaseLTCG|ARM64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.ReleaseLTCG|ARM64.Build.0 = ReleaseLTCG|ARM64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.ReleaseLTCG-Clang|ARM64.ActiveCfg = ReleaseLTCG-Clang|ARM64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.ReleaseLTCG-Clang|ARM64.Build.0 = ReleaseLTCG-Clang|ARM64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.ReleaseLTCG-Clang|x64.ActiveCfg = ReleaseLTCG-Clang|x64
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797}.ReleaseLTCG-Clang|x64.Build.0 = ReleaseLTCG-Clang|x64
{EE55AA65-EA6B-4861-810B-78354B53A807}.Debug|ARM64.ActiveCfg = Debug|ARM64
{EE55AA65-EA6B-4861-810B-78354B53A807}.Debug|ARM64.Build.0 = Debug|ARM64
{EE55AA65-EA6B-4861-810B-78354B53A807}.Debug|x64.ActiveCfg = Debug|x64
@@ -1035,70 +962,6 @@ Global
{1AD23A8A-4C20-434C-AE6B-0E07759EEB1E}.ReleaseLTCG-Clang|ARM64.Build.0 = ReleaseLTCG-Clang|ARM64
{1AD23A8A-4C20-434C-AE6B-0E07759EEB1E}.ReleaseLTCG-Clang|x64.ActiveCfg = ReleaseLTCG-Clang|x64
{1AD23A8A-4C20-434C-AE6B-0E07759EEB1E}.ReleaseLTCG-Clang|x64.Build.0 = ReleaseLTCG-Clang|x64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.Debug|ARM64.ActiveCfg = Debug|ARM64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.Debug|ARM64.Build.0 = Debug|ARM64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.Debug|x64.ActiveCfg = Debug|x64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.Debug|x64.Build.0 = Debug|x64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.Debug-Clang|ARM64.ActiveCfg = Debug-Clang|ARM64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.Debug-Clang|ARM64.Build.0 = Debug-Clang|ARM64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.Debug-Clang|x64.ActiveCfg = Debug-Clang|x64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.Debug-Clang|x64.Build.0 = Debug-Clang|x64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.DebugFast|ARM64.ActiveCfg = DebugFast|ARM64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.DebugFast|ARM64.Build.0 = DebugFast|ARM64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.DebugFast|x64.ActiveCfg = DebugFast|x64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.DebugFast|x64.Build.0 = DebugFast|x64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.DebugFast-Clang|ARM64.ActiveCfg = DebugFast-Clang|ARM64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.DebugFast-Clang|ARM64.Build.0 = DebugFast-Clang|ARM64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.DebugFast-Clang|x64.ActiveCfg = DebugFast-Clang|x64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.DebugFast-Clang|x64.Build.0 = DebugFast-Clang|x64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.Release|ARM64.ActiveCfg = Release|ARM64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.Release|ARM64.Build.0 = Release|ARM64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.Release|x64.ActiveCfg = Release|x64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.Release|x64.Build.0 = Release|x64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.Release-Clang|ARM64.ActiveCfg = Release-Clang|ARM64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.Release-Clang|ARM64.Build.0 = Release-Clang|ARM64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.Release-Clang|x64.ActiveCfg = Release-Clang|x64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.Release-Clang|x64.Build.0 = Release-Clang|x64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.ReleaseLTCG|ARM64.ActiveCfg = ReleaseLTCG|ARM64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.ReleaseLTCG|ARM64.Build.0 = ReleaseLTCG|ARM64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.ReleaseLTCG-Clang|ARM64.ActiveCfg = ReleaseLTCG-Clang|ARM64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.ReleaseLTCG-Clang|ARM64.Build.0 = ReleaseLTCG-Clang|ARM64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.ReleaseLTCG-Clang|x64.ActiveCfg = ReleaseLTCG-Clang|x64
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5}.ReleaseLTCG-Clang|x64.Build.0 = ReleaseLTCG-Clang|x64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.Debug|ARM64.ActiveCfg = Debug|ARM64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.Debug|ARM64.Build.0 = Debug|ARM64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.Debug|x64.ActiveCfg = Debug|x64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.Debug|x64.Build.0 = Debug|x64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.Debug-Clang|ARM64.ActiveCfg = Debug-Clang|ARM64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.Debug-Clang|ARM64.Build.0 = Debug-Clang|ARM64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.Debug-Clang|x64.ActiveCfg = Debug-Clang|x64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.Debug-Clang|x64.Build.0 = Debug-Clang|x64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.DebugFast|ARM64.ActiveCfg = DebugFast|ARM64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.DebugFast|ARM64.Build.0 = DebugFast|ARM64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.DebugFast|x64.ActiveCfg = DebugFast|x64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.DebugFast|x64.Build.0 = DebugFast|x64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.DebugFast-Clang|ARM64.ActiveCfg = DebugFast-Clang|ARM64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.DebugFast-Clang|ARM64.Build.0 = DebugFast-Clang|ARM64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.DebugFast-Clang|x64.ActiveCfg = DebugFast-Clang|x64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.DebugFast-Clang|x64.Build.0 = DebugFast-Clang|x64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.Release|ARM64.ActiveCfg = Release|ARM64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.Release|ARM64.Build.0 = Release|ARM64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.Release|x64.ActiveCfg = Release|x64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.Release|x64.Build.0 = Release|x64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.Release-Clang|ARM64.ActiveCfg = Release-Clang|ARM64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.Release-Clang|ARM64.Build.0 = Release-Clang|ARM64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.Release-Clang|x64.ActiveCfg = Release-Clang|x64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.Release-Clang|x64.Build.0 = Release-Clang|x64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.ReleaseLTCG|ARM64.ActiveCfg = ReleaseLTCG|ARM64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.ReleaseLTCG|ARM64.Build.0 = ReleaseLTCG|ARM64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.ReleaseLTCG-Clang|ARM64.ActiveCfg = ReleaseLTCG-Clang|ARM64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.ReleaseLTCG-Clang|ARM64.Build.0 = ReleaseLTCG-Clang|ARM64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.ReleaseLTCG-Clang|x64.ActiveCfg = ReleaseLTCG-Clang|x64
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2}.ReleaseLTCG-Clang|x64.Build.0 = ReleaseLTCG-Clang|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -1109,7 +972,6 @@ Global
{3773F4CC-614E-4028-8595-22E08CA649E3} = {BA490C0E-497D-4634-A21E-E65012006385}
{72F9423C-91EE-4487-AAC6-555ED6F61AA1} = {BA490C0E-497D-4634-A21E-E65012006385}
{8BDA439C-6358-45FB-9994-2FF083BABE06} = {BA490C0E-497D-4634-A21E-E65012006385}
- {7FF9FDB9-D504-47DB-A16A-B08071999620} = {BA490C0E-497D-4634-A21E-E65012006385}
{425D6C99-D1C8-43C2-B8AC-4D7B1D941017} = {BA490C0E-497D-4634-A21E-E65012006385}
{DD944834-7899-4C1C-A4C1-064B5009D239} = {BA490C0E-497D-4634-A21E-E65012006385}
{09553C96-9F39-49BF-8AE6-7ACBD07C410C} = {BA490C0E-497D-4634-A21E-E65012006385}
@@ -1121,14 +983,11 @@ Global
{E4357877-D459-45C7-B8F6-DCBB587BB528} = {BA490C0E-497D-4634-A21E-E65012006385}
{8BE398E6-B882-4248-9065-FECC8728E038} = {BA490C0E-497D-4634-A21E-E65012006385}
{751D9F62-881C-454E-BCE8-CB9CF5F1D22F} = {BA490C0E-497D-4634-A21E-E65012006385}
- {73EE0C55-6FFE-44E7-9C12-BAA52434A797} = {BA490C0E-497D-4634-A21E-E65012006385}
{EE55AA65-EA6B-4861-810B-78354B53A807} = {BA490C0E-497D-4634-A21E-E65012006385}
{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699} = {BA490C0E-497D-4634-A21E-E65012006385}
{F351C4D8-594A-4850-B77B-3C1249812CCE} = {BA490C0E-497D-4634-A21E-E65012006385}
{27B8D4BB-4F01-4432-BC14-9BF6CA458EEE} = {BA490C0E-497D-4634-A21E-E65012006385}
{1AD23A8A-4C20-434C-AE6B-0E07759EEB1E} = {BA490C0E-497D-4634-A21E-E65012006385}
- {9FD2ABCD-2DCD-4302-BE5C-DF0BA8431FA5} = {BA490C0E-497D-4634-A21E-E65012006385}
- {EC3B6685-0B6E-4767-84AB-39B75EEAD2E2} = {BA490C0E-497D-4634-A21E-E65012006385}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {26E40B32-7C1D-48D0-95F4-1A500E054028}
diff --git a/scripts/build-dependencies-mac.sh b/scripts/build-dependencies-mac.sh
index 0326cee83..bd180151f 100755
--- a/scripts/build-dependencies-mac.sh
+++ b/scripts/build-dependencies-mac.sh
@@ -26,31 +26,47 @@ if [ "$#" -ne 1 ]; then
fi
export MACOSX_DEPLOYMENT_TARGET=11.0
+
INSTALLDIR="$1"
NPROCS="$(getconf _NPROCESSORS_ONLN)"
SDL=SDL2-2.30.1
-QT=6.6.2
-MOLTENVK=1.2.6
+ZLIB=1.3.1
ZSTD=1.5.5
-PNG=1.6.43
-JPEG=9f
-WEBP=1.3.2
+LIBPNG=1.6.43
+LIBJPEG=9f
+LIBWEBP=1.3.2
+MOLTENVK=1.2.8
+QT=6.6.2
+
+if [ "${INSTALLDIR:0:1}" != "/" ]; then
+ INSTALLDIR="$PWD/$INSTALLDIR"
+fi
mkdir -p deps-build
cd deps-build
export PKG_CONFIG_PATH="$INSTALLDIR/lib/pkgconfig:$PKG_CONFIG_PATH"
-export LDFLAGS="-L$INSTALLDIR/lib -dead_strip $LDFLAGS"
-export CFLAGS="-I$INSTALLDIR/include -Os $CFLAGS"
-export CXXFLAGS="-I$INSTALLDIR/include -Os $CXXFLAGS"
+export LDFLAGS="-L$INSTALLDIR/lib $LDFLAGS"
+export CFLAGS="-I$INSTALLDIR/include $CFLAGS"
+export CXXFLAGS="-I$INSTALLDIR/include $CXXFLAGS"
+CMAKE_COMMON=(
+ -DCMAKE_BUILD_TYPE=Release
+ -DCMAKE_PREFIX_PATH="$INSTALLDIR"
+ -DCMAKE_INSTALL_PREFIX="$INSTALLDIR"
+ -DCMAKE_INSTALL_NAME_DIR='$/lib'
+)
+CMAKE_ARCH_X64=-DCMAKE_OSX_ARCHITECTURES="x86_64"
+CMAKE_ARCH_ARM64=-DCMAKE_OSX_ARCHITECTURES="arm64"
+CMAKE_ARCH_UNIVERSAL=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
cat > SHASUMS <
- $(SolutionDir)src;%(AdditionalIncludeDirectories);$(SolutionDir)dep\fast_float\include;$(SolutionDir)dep\fmt\include;$(SolutionDir)dep\zlib\include;$(SolutionDir)dep\minizip\include;$(SolutionDir)dep\stb\include
+ $(SolutionDir)src;%(AdditionalIncludeDirectories);$(SolutionDir)dep\fast_float\include;$(SolutionDir)dep\fmt\include
%(PreprocessorDefinitions);FMT_EXCEPTIONS=0
stdcpp20
diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj
index 1fdd6177d..67f9138ee 100644
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@@ -56,7 +56,6 @@
-
@@ -87,15 +86,6 @@
{8be398e6-b882-4248-9065-fecc8728e038}
-
- {8bda439c-6358-45fb-9994-2ff083babe06}
-
-
- {7ff9fdb9-d504-47db-a16a-b08071999620}
-
-
- {73ee0c55-6ffe-44e7-9c12-baa52434a797}
-
@@ -113,7 +103,6 @@
$(IntDir)/%(RelativeDir)/
- %(AdditionalIncludeDirectories);$(SolutionDir)dep\zstd\lib
diff --git a/src/common/common.vcxproj.filters b/src/common/common.vcxproj.filters
index a093a195c..bfb354dc2 100644
--- a/src/common/common.vcxproj.filters
+++ b/src/common/common.vcxproj.filters
@@ -56,7 +56,6 @@
-
thirdparty
diff --git a/src/common/minizip_helpers.cpp b/src/common/minizip_helpers.cpp
deleted file mode 100644
index f093fbba1..000000000
--- a/src/common/minizip_helpers.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin
-// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
-
-#include "minizip_helpers.h"
-#include "file_system.h"
-#include "ioapi.h"
-#include "types.h"
-#include
-
-namespace MinizipHelpers {
-
-unzFile OpenUnzMemoryFile(const void* memory, size_t memory_size)
-{
- struct MemoryFileInfo
- {
- const u8* data;
- ZPOS64_T data_size;
- ZPOS64_T position;
- };
-
- MemoryFileInfo* fi = new MemoryFileInfo;
- fi->data = static_cast(memory);
- fi->data_size = static_cast(memory_size);
- fi->position = 0;
-
-#define FI static_cast(stream)
-
- zlib_filefunc64_def funcs = {
- [](voidpf opaque, const void* filename, int mode) -> voidpf { return opaque; }, // open
- [](voidpf opaque, voidpf stream, void* buf, uLong size) -> uLong { // read
- const ZPOS64_T remaining = FI->data_size - FI->position;
- const ZPOS64_T to_read = std::min(remaining, static_cast(size));
- if (to_read > 0)
- {
- std::memcpy(buf, FI->data + FI->position, to_read);
- FI->position += to_read;
- }
-
- return static_cast(to_read);
- },
- [](voidpf opaque, voidpf stream, const void* buf, uLong size) -> uLong { return 0; }, // write
- [](voidpf opaque, voidpf stream) -> ZPOS64_T { return static_cast(FI->position); }, // tell
- [](voidpf opaque, voidpf stream, ZPOS64_T offset, int origin) -> long { // seek
- ZPOS64_T new_position = FI->position;
- if (origin == SEEK_SET)
- new_position = static_cast(offset);
- else if (origin == SEEK_CUR)
- new_position += static_cast(offset);
- else
- new_position = FI->data_size;
- if (new_position < 0 || new_position > FI->data_size)
- return -1;
-
- FI->position = new_position;
- return 0;
- },
- [](voidpf opaque, voidpf stream) -> int {
- delete FI;
- return 0;
- }, // close
- [](voidpf opaque, voidpf stream) -> int { return 0; }, // testerror
- static_cast(fi)};
-
-#undef FI
-
- unzFile zf = unzOpen2_64("", &funcs);
- if (!zf)
- delete fi;
-
- return zf;
-}
-
-unzFile OpenUnzFile(const char* filename)
-{
- zlib_filefunc64_def funcs;
- fill_fopen64_filefunc(&funcs);
-
- funcs.zopen64_file = [](voidpf opaque, const void* filename, int mode) -> voidpf {
- const char* mode_fopen = NULL;
- if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER) == ZLIB_FILEFUNC_MODE_READ)
- mode_fopen = "rb";
- else if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
- mode_fopen = "r+b";
- else if (mode & ZLIB_FILEFUNC_MODE_CREATE)
- mode_fopen = "wb";
-
- return FileSystem::OpenCFile(static_cast(filename), mode_fopen);
- };
-
- return unzOpen2_64(filename, &funcs);
-}
-
-} // namespace MinizipHelpers
\ No newline at end of file
diff --git a/src/common/minizip_helpers.h b/src/common/minizip_helpers.h
index a010bea76..b9cca033d 100644
--- a/src/common/minizip_helpers.h
+++ b/src/common/minizip_helpers.h
@@ -1,12 +1,95 @@
-// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin
+// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin
// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
#pragma once
+
+#include "file_system.h"
+#include "ioapi.h"
+#include "types.h"
#include "unzip.h"
+#include
namespace MinizipHelpers {
-unzFile OpenUnzMemoryFile(const void* memory, size_t memory_size);
-unzFile OpenUnzFile(const char* filename);
+[[maybe_unused]] static unzFile OpenUnzMemoryFile(const void* memory, size_t memory_size)
+{
+ struct MemoryFileInfo
+ {
+ const u8* data;
+ ZPOS64_T data_size;
+ ZPOS64_T position;
+ };
+
+ MemoryFileInfo* fi = new MemoryFileInfo;
+ fi->data = static_cast(memory);
+ fi->data_size = static_cast(memory_size);
+ fi->position = 0;
+
+#define FI static_cast(stream)
+
+ zlib_filefunc64_def funcs = {
+ [](voidpf opaque, const void* filename, int mode) -> voidpf { return opaque; }, // open
+ [](voidpf opaque, voidpf stream, void* buf, uLong size) -> uLong { // read
+ const ZPOS64_T remaining = FI->data_size - FI->position;
+ const ZPOS64_T to_read = std::min(remaining, static_cast(size));
+ if (to_read > 0)
+ {
+ std::memcpy(buf, FI->data + FI->position, to_read);
+ FI->position += to_read;
+ }
+
+ return static_cast(to_read);
+ },
+ [](voidpf opaque, voidpf stream, const void* buf, uLong size) -> uLong { return 0; }, // write
+ [](voidpf opaque, voidpf stream) -> ZPOS64_T { return static_cast(FI->position); }, // tell
+ [](voidpf opaque, voidpf stream, ZPOS64_T offset, int origin) -> long { // seek
+ ZPOS64_T new_position = FI->position;
+ if (origin == SEEK_SET)
+ new_position = static_cast(offset);
+ else if (origin == SEEK_CUR)
+ new_position += static_cast(offset);
+ else
+ new_position = FI->data_size;
+ if (new_position < 0 || new_position > FI->data_size)
+ return -1;
+
+ FI->position = new_position;
+ return 0;
+ },
+ [](voidpf opaque, voidpf stream) -> int {
+ delete FI;
+ return 0;
+ }, // close
+ [](voidpf opaque, voidpf stream) -> int { return 0; }, // testerror
+ static_cast(fi)};
+
+#undef FI
+
+ unzFile zf = unzOpen2_64("", &funcs);
+ if (!zf)
+ delete fi;
+
+ return zf;
+}
+
+[[maybe_unused]] static unzFile OpenUnzFile(const char* filename)
+{
+ zlib_filefunc64_def funcs;
+ fill_fopen64_filefunc(&funcs);
+
+ funcs.zopen64_file = [](voidpf opaque, const void* filename, int mode) -> voidpf {
+ const char* mode_fopen = NULL;
+ if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER) == ZLIB_FILEFUNC_MODE_READ)
+ mode_fopen = "rb";
+ else if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
+ mode_fopen = "r+b";
+ else if (mode & ZLIB_FILEFUNC_MODE_CREATE)
+ mode_fopen = "wb";
+
+ return FileSystem::OpenCFile(static_cast(filename), mode_fopen);
+ };
+
+ return unzOpen2_64(filename, &funcs);
+}
} // namespace MinizipHelpers
\ No newline at end of file
diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
index 54cfc4ef4..9602ed4a8 100644
--- a/src/core/core.vcxproj
+++ b/src/core/core.vcxproj
@@ -184,12 +184,6 @@
{09553c96-9f39-49bf-8ae6-7acbd07c410c}
-
- {7ff9fdb9-d504-47db-a16a-b08071999620}
-
-
- {73ee0c55-6ffe-44e7-9c12-baa52434a797}
-
{c51a346a-86b2-46df-9bb3-d0aa7e5d8699}
diff --git a/src/duckstation-qt/duckstation-qt.vcxproj b/src/duckstation-qt/duckstation-qt.vcxproj
index d584fd5a0..ebca67b57 100644
--- a/src/duckstation-qt/duckstation-qt.vcxproj
+++ b/src/duckstation-qt/duckstation-qt.vcxproj
@@ -341,6 +341,9 @@
{bb08260f-6fbc-46af-8924-090ee71360c6}
+
+ {8bda439c-6358-45fb-9994-2ff083babe06}
+
{ee054e08-3799-4a59-a422-18259c105ffd}
@@ -378,6 +381,7 @@
QT_NO_EXCEPTIONS=1;%(PreprocessorDefinitions)
4127;%(DisableSpecificWarnings)
+ %(AdditionalIncludeDirectories);$(SolutionDir)dep\minizip\include
diff --git a/src/updater/updater.vcxproj b/src/updater/updater.vcxproj
index 8cbed4b2b..65b27ba4c 100644
--- a/src/updater/updater.vcxproj
+++ b/src/updater/updater.vcxproj
@@ -17,9 +17,6 @@
{8bda439c-6358-45fb-9994-2ff083babe06}
-
- {7ff9fdb9-d504-47db-a16a-b08071999620}
-
{ee054e08-3799-4a59-a422-18259c105ffd}
@@ -31,10 +28,10 @@
- $(SolutionDir)dep\minizip\include;$(SolutionDir)dep\zlib\include;$(SolutionDir)src;%(AdditionalIncludeDirectories)
+ %(AdditionalIncludeDirectories);$(SolutionDir)dep\minizip\include;$(SolutionDir)src
- %(AdditionalDependencies);Comctl32.lib
+ %(AdditionalDependencies);Comctl32.lib;zlib.lib
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index 88419d486..b14c24cef 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -77,7 +77,7 @@ target_precompile_headers(util PRIVATE "pch.h")
target_include_directories(util PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")
target_include_directories(util PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..")
target_link_libraries(util PUBLIC common simpleini imgui)
-target_link_libraries(util PRIVATE libchdr JPEG::JPEG PNG::PNG ZLIB::ZLIB soundtouch xxhash Zstd::Zstd reshadefx)
+target_link_libraries(util PRIVATE libchdr JPEG::JPEG PNG::PNG WebP::libwebp ZLIB::ZLIB soundtouch xxhash Zstd::Zstd reshadefx)
if(ENABLE_CUBEB)
target_sources(util PRIVATE
diff --git a/src/util/util.props b/src/util/util.props
index 7babd81ff..dc46f7000 100644
--- a/src/util/util.props
+++ b/src/util/util.props
@@ -8,7 +8,7 @@
ENABLE_CUBEB=1;ENABLE_SDL2=1;%(PreprocessorDefinitions)
%(PreprocessorDefinitions);ENABLE_OPENGL=1;ENABLE_VULKAN=1
%(PreprocessorDefinitions);SOUNDTOUCH_USE_NEON
- %(AdditionalIncludeDirectories);$(SolutionDir)dep\xxhash\include;$(SolutionDir)dep\soundtouch\include;$(SolutionDir)dep\imgui\include;$(SolutionDir)dep\simpleini\include;$(SolutionDir)dep\libchdr\include;$(SolutionDir)dep\cubeb\include;$(SolutionDir)dep\d3d12ma\include;$(SolutionDir)dep\zstd\lib;$(SolutionDir)dep\libpng\include;$(SolutionDir)dep\libjpeg\include
+ %(AdditionalIncludeDirectories);$(SolutionDir)dep\xxhash\include;$(SolutionDir)dep\soundtouch\include;$(SolutionDir)dep\imgui\include;$(SolutionDir)dep\simpleini\include;$(SolutionDir)dep\libchdr\include;$(SolutionDir)dep\cubeb\include;$(SolutionDir)dep\d3d12ma\include
%(AdditionalIncludeDirectories);$(SolutionDir)dep\glad\include;$(SolutionDir)dep\vulkan\include;$(SolutionDir)dep\glslang
@@ -20,6 +20,35 @@
-
+
+
+
+
+ %(AdditionalIncludeDirectories);$(DepsIncludeDir)SDL2
+
+
+ %(AdditionalDependencies);libjpeg.lib;libpng16.lib;libwebp.lib;SDL2.lib;zlib.lib;zstd.lib
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/util/util.vcxproj b/src/util/util.vcxproj
index e3c184228..c5d977935 100644
--- a/src/util/util.vcxproj
+++ b/src/util/util.vcxproj
@@ -254,12 +254,6 @@
{425d6c99-d1c8-43c2-b8ac-4d7b1d941017}
-
- {ec3b6685-0b6e-4767-84ab-39b75eead2e2}
-
-
- {9fd2abcd-2dcd-4302-be5c-df0ba8431fa5}
-
{27b8d4bb-4f01-4432-bc14-9bf6ca458eee}
@@ -272,9 +266,6 @@
{7f909e29-4808-4bd9-a60c-56c51a3aaec2}
-
- {73ee0c55-6ffe-44e7-9c12-baa52434a797}
-
{ee054e08-3799-4a59-a422-18259c105ffd}