This commit is contained in:
parent
7fd5042e4b
commit
51d3360e0e
@ -1,31 +1,20 @@
|
|||||||
Index: ppsspp-1.14.4/ext/vma/vk_mem_alloc.h
|
From 822592c6b1441f7110e1cb15dcc5cd2ea1de8099 Mon Sep 17 00:00:00 2001
|
||||||
===================================================================
|
From: Andreas Stieger <Andreas.Stieger@gmx.de>
|
||||||
--- ppsspp-1.14.4.orig/ext/vma/vk_mem_alloc.h
|
Date: Wed, 5 Apr 2023 00:20:14 +0200
|
||||||
+++ ppsspp-1.14.4/ext/vma/vk_mem_alloc.h
|
Subject: [PATCH] Fix build with GCC13: various standard includes
|
||||||
@@ -2624,6 +2624,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeS
|
|
||||||
#include <cstring>
|
---
|
||||||
#include <utility>
|
Common/Data/Format/IniFile.h | 1 +
|
||||||
#include <type_traits>
|
Common/GPU/OpenGL/GLFeatures.h | 1 +
|
||||||
+#include <cstdio>
|
Common/Net/NetBuffer.h | 2 ++
|
||||||
|
Core/Reporting.h | 1 +
|
||||||
#ifdef _MSC_VER
|
ext/vma/vk_mem_alloc.h | 1 +
|
||||||
#include <intrin.h> // For functions like __popcnt, _BitScanForward etc.
|
5 files changed, 6 insertions(+)
|
||||||
Index: ppsspp-1.14.4/Core/Reporting.h
|
|
||||||
===================================================================
|
diff --git a/Common/Data/Format/IniFile.h b/Common/Data/Format/IniFile.h
|
||||||
--- ppsspp-1.14.4.orig/Core/Reporting.h
|
index 1008fff5df94..cbe73f185542 100644
|
||||||
+++ ppsspp-1.14.4/Core/Reporting.h
|
--- a/Common/Data/Format/IniFile.h
|
||||||
@@ -19,6 +19,7 @@
|
+++ b/Common/Data/Format/IniFile.h
|
||||||
|
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
|
||||||
+#include <cstdint>
|
|
||||||
|
|
||||||
#include "Common/CommonTypes.h"
|
|
||||||
#include "Common/File/Path.h"
|
|
||||||
Index: ppsspp-1.14.4/Common/Data/Format/IniFile.h
|
|
||||||
===================================================================
|
|
||||||
--- ppsspp-1.14.4.orig/Common/Data/Format/IniFile.h
|
|
||||||
+++ ppsspp-1.14.4/Common/Data/Format/IniFile.h
|
|
||||||
@@ -8,6 +8,7 @@
|
@@ -8,6 +8,7 @@
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <string>
|
#include <string>
|
||||||
@ -34,22 +23,10 @@ Index: ppsspp-1.14.4/Common/Data/Format/IniFile.h
|
|||||||
|
|
||||||
#include "Common/File/Path.h"
|
#include "Common/File/Path.h"
|
||||||
|
|
||||||
Index: ppsspp-1.14.4/Common/Net/NetBuffer.h
|
diff --git a/Common/GPU/OpenGL/GLFeatures.h b/Common/GPU/OpenGL/GLFeatures.h
|
||||||
===================================================================
|
index 04df20f87f5a..f2aa3380568d 100644
|
||||||
--- ppsspp-1.14.4.orig/Common/Net/NetBuffer.h
|
--- a/Common/GPU/OpenGL/GLFeatures.h
|
||||||
+++ ppsspp-1.14.4/Common/Net/NetBuffer.h
|
+++ b/Common/GPU/OpenGL/GLFeatures.h
|
||||||
@@ -1,5 +1,7 @@
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
+#include <cstdint>
|
|
||||||
+
|
|
||||||
#include "Common/Buffer.h"
|
|
||||||
|
|
||||||
namespace net {
|
|
||||||
Index: ppsspp-1.14.4/Common/GPU/OpenGL/GLFeatures.h
|
|
||||||
===================================================================
|
|
||||||
--- ppsspp-1.14.4.orig/Common/GPU/OpenGL/GLFeatures.h
|
|
||||||
+++ ppsspp-1.14.4/Common/GPU/OpenGL/GLFeatures.h
|
|
||||||
@@ -5,6 +5,7 @@
|
@@ -5,6 +5,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
@ -58,3 +35,39 @@ Index: ppsspp-1.14.4/Common/GPU/OpenGL/GLFeatures.h
|
|||||||
|
|
||||||
// TODO: Replace with thin3d's vendor enum.
|
// TODO: Replace with thin3d's vendor enum.
|
||||||
enum {
|
enum {
|
||||||
|
diff --git a/Common/Net/NetBuffer.h b/Common/Net/NetBuffer.h
|
||||||
|
index 6247aca98555..12a4ba37c8c4 100644
|
||||||
|
--- a/Common/Net/NetBuffer.h
|
||||||
|
+++ b/Common/Net/NetBuffer.h
|
||||||
|
@@ -1,5 +1,7 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
+#include <cstdint>
|
||||||
|
+
|
||||||
|
#include "Common/Buffer.h"
|
||||||
|
|
||||||
|
namespace net {
|
||||||
|
diff --git a/Core/Reporting.h b/Core/Reporting.h
|
||||||
|
index 211267c8f77c..1d254256f75a 100644
|
||||||
|
--- a/Core/Reporting.h
|
||||||
|
+++ b/Core/Reporting.h
|
||||||
|
@@ -19,6 +19,7 @@
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
#include <vector>
|
||||||
|
+#include <cstdint>
|
||||||
|
|
||||||
|
#include "Common/CommonTypes.h"
|
||||||
|
#include "Common/File/Path.h"
|
||||||
|
diff --git a/ext/vma/vk_mem_alloc.h b/ext/vma/vk_mem_alloc.h
|
||||||
|
index f52dceeaf416..90719c161516 100644
|
||||||
|
--- a/ext/vma/vk_mem_alloc.h
|
||||||
|
+++ b/ext/vma/vk_mem_alloc.h
|
||||||
|
@@ -2624,6 +2624,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(
|
||||||
|
#include <cstring>
|
||||||
|
#include <utility>
|
||||||
|
#include <type_traits>
|
||||||
|
+#include <cstdio>
|
||||||
|
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#include <intrin.h> // For functions like __popcnt, _BitScanForward etc.
|
||||||
|
Loading…
Reference in New Issue
Block a user