Buildfixes

CMakeLists.txt

@@ -719,6 +719,10 @@ add_library(gason STATIC
     ext/gason/gason.h
 )
 
+add_library(vma STATIC
+    ext/vma/vk_mem_alloc.cpp
+    ext/vma/vk_mem_alloc.h
+)
 
 if(USE_FFMPEG)
 	if(NOT FFMPEG_DIR)
@@ -1264,7 +1268,7 @@ if(ANDROID)
 	set(ATOMIC_LIB atomic)
 endif()
 
-target_link_libraries(native ${LIBZIP_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARY} gason udis86 ${RT_LIB} ${nativeExtraLibs} ${ATOMIC_LIB} Common)
+target_link_libraries(native ${LIBZIP_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARY} vma gason udis86 ${RT_LIB} ${nativeExtraLibs} ${ATOMIC_LIB} Common)
 if(TARGET Ext::GLEW)
 	target_link_libraries(native Ext::GLEW)
 endif()

android/jni/Android.mk

@@ -143,6 +143,9 @@ VULKAN_FILES := \
   $(SRC)/GPU/Vulkan/DebugVisVulkan.cpp
 #endif
 
+VMA_FILES := \
+  $(SRC)/ext/vma/vk_mem_alloc.cpp
+
 SPIRV_CROSS_FILES := \
   $(SRC)/ext/SPIRV-Cross/spirv_cfg.cpp \
   $(SRC)/ext/SPIRV-Cross/spirv_cross.cpp \
@@ -198,6 +201,7 @@ EXEC_AND_LIB_FILES := \
   $(ARCH_FILES) \
   $(EGL_FILES) \
   $(VULKAN_FILES) \
+  $(VMA_FILES) \
   $(SPIRV_CROSS_FILES) \
   $(EXT_FILES) \
   $(NATIVE_FILES) \

ext/vma/vk_mem_alloc.cpp

@@ -1,10 +1,13 @@
 #define VMA_IMPLEMENTATION
 
-// BEGIN PPSSPP HACKS !!!!!
+#include "ppsspp_config.h"
+
+#if PPSSPP_PLATFORM(WINDOWS)
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
+#endif
+
 #include "Common/GPU/Vulkan/VulkanLoader.h"
-// END PPSSPP HACKS
 
 using namespace PPSSPP_VK;
 

libretro/Makefile.common

@@ -193,6 +193,9 @@ SOURCES_C += \
 	$(EXTDIR)/libpng17/pngwtran.c \
 	$(EXTDIR)/libpng17/pngwutil.c
 
+SOURCES_CXX += \
+    $(EXTDIR)/vma/vk_mem_alloc.cpp
+
 SOURCES_C += $(EXTDIR)/sfmt19937/SFMT.c
 SOURCES_C   += $(EXTDIR)/xxhash.c