From 97e8d5b93bf1171ee7d2b02d3e2e030ecd484a76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 2 Nov 2020 10:37:11 +0100 Subject: [PATCH] Buildfix the rest of the platforms --- CMakeLists.txt | 2 ++ GPU/Common/ShaderWriter.h | 2 +- UWP/GPU_UWP/GPU_UWP.vcxproj | 2 ++ UWP/GPU_UWP/GPU_UWP.vcxproj.filters | 2 ++ android/jni/Android.mk | 1 + libretro/Makefile.common | 1 + 6 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dad85680cb..8f9f5ee4e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1356,6 +1356,8 @@ set(GPU_SOURCES GPU/Common/ShaderUniforms.h GPU/Common/ShaderCommon.cpp GPU/Common/ShaderCommon.h + GPU/Common/ShaderWriter.cpp + GPU/Common/ShaderWriter.h GPU/Common/ShaderTranslation.cpp GPU/Common/ShaderTranslation.h GPU/Common/SplineCommon.cpp diff --git a/GPU/Common/ShaderWriter.h b/GPU/Common/ShaderWriter.h index 25f24e8e5d..757c76fa46 100644 --- a/GPU/Common/ShaderWriter.h +++ b/GPU/Common/ShaderWriter.h @@ -28,7 +28,7 @@ public: } // Formats into the buffer. - void W(char *format, ...); + void W(const char *format, ...); // void BeginMain(); // void EndMain(); diff --git a/UWP/GPU_UWP/GPU_UWP.vcxproj b/UWP/GPU_UWP/GPU_UWP.vcxproj index d5b5d3167e..aef600ae34 100644 --- a/UWP/GPU_UWP/GPU_UWP.vcxproj +++ b/UWP/GPU_UWP/GPU_UWP.vcxproj @@ -392,6 +392,7 @@ + @@ -449,6 +450,7 @@ + diff --git a/UWP/GPU_UWP/GPU_UWP.vcxproj.filters b/UWP/GPU_UWP/GPU_UWP.vcxproj.filters index 12f33ec3af..c1e17c829d 100644 --- a/UWP/GPU_UWP/GPU_UWP.vcxproj.filters +++ b/UWP/GPU_UWP/GPU_UWP.vcxproj.filters @@ -57,6 +57,7 @@ + @@ -114,5 +115,6 @@ + \ No newline at end of file diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 71e6915927..4498059207 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -318,6 +318,7 @@ EXEC_AND_LIB_FILES := \ $(SRC)/GPU/Common/TextureCacheCommon.cpp.arm \ $(SRC)/GPU/Common/TextureScalerCommon.cpp.arm \ $(SRC)/GPU/Common/ShaderCommon.cpp \ + $(SRC)/GPU/Common/ShaderWriter.cpp \ $(SRC)/GPU/Common/ShaderTranslation.cpp \ $(SRC)/GPU/Common/StencilCommon.cpp \ $(SRC)/GPU/Common/SplineCommon.cpp.arm \ diff --git a/libretro/Makefile.common b/libretro/Makefile.common index 3120c903c8..bd03911b48 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -236,6 +236,7 @@ SOURCES_CXX += \ $(GPUCOMMONDIR)/ShaderCommon.cpp \ $(GPUCOMMONDIR)/ShaderUniforms.cpp \ $(GPUCOMMONDIR)/ShaderTranslation.cpp \ + $(GPUCOMMONDIR)/ShaderWriter.cpp \ $(GPUCOMMONDIR)/GPUDebugInterface.cpp \ $(GPUCOMMONDIR)/DepalettizeShaderCommon.cpp \ $(GPUCOMMONDIR)/TransformCommon.cpp \