From 5c7511726265af3f0d75c031a9474fa4ddaaab67 Mon Sep 17 00:00:00 2001
From: Linus Groh <mail@linusgroh.de>
Date: Tue, 4 Jul 2023 16:45:24 +0100
Subject: [PATCH] Ports/SuperTuxKart: Clean up IrrCompileConfig.h patch a
 little

There was still some code commented out from earlier attempts
piggybacking on Haiku ifdefs, this should now be in an upstreamable
state.
---
 ...dd-build-system-support-for-Serenity.patch | 39 +++++++------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/Ports/SuperTuxKart/patches/0001-Add-build-system-support-for-Serenity.patch b/Ports/SuperTuxKart/patches/0001-Add-build-system-support-for-Serenity.patch
index 03a98b1f40..40268fe293 100644
--- a/Ports/SuperTuxKart/patches/0001-Add-build-system-support-for-Serenity.patch
+++ b/Ports/SuperTuxKart/patches/0001-Add-build-system-support-for-Serenity.patch
@@ -4,10 +4,10 @@ Date: Sun, 11 Jun 2023 01:56:50 +0200
 Subject: [PATCH] Add build system support for Serenity
 
 ---
- lib/angelscript/source/as_memory.cpp             |  2 +-
- lib/irrlicht/include/IrrCompileConfig.h          | 16 ++++++++++++----
- .../third_party/spirv-tools/CMakeLists.txt       |  2 ++
- 3 files changed, 15 insertions(+), 5 deletions(-)
+ lib/angelscript/source/as_memory.cpp               | 2 +-
+ lib/irrlicht/include/IrrCompileConfig.h            | 9 +++++++--
+ lib/shaderc/third_party/spirv-tools/CMakeLists.txt | 2 ++
+ 3 files changed, 10 insertions(+), 3 deletions(-)
 
 diff --git a/lib/angelscript/source/as_memory.cpp b/lib/angelscript/source/as_memory.cpp
 index 5914658ba23736da57506fc58066032b5f99e435..399a3842300ed01adaf0afdbf2ae794fd89c0415 100644
@@ -23,7 +23,7 @@ index 5914658ba23736da57506fc58066032b5f99e435..399a3842300ed01adaf0afdbf2ae794f
  #endif
  
 diff --git a/lib/irrlicht/include/IrrCompileConfig.h b/lib/irrlicht/include/IrrCompileConfig.h
-index 384c6836e2050ad8cfeaa4da3bf3365b5a3cf1a8..92a8d3dd4b6c82ee571ca2bf2d7858709de4f9d5 100644
+index 384c6836e2050ad8cfeaa4da3bf3365b5a3cf1a8..3ddcf1951ef9a174ccdf5ac04304d5481b85ac59 100644
 --- a/lib/irrlicht/include/IrrCompileConfig.h
 +++ b/lib/irrlicht/include/IrrCompileConfig.h
 @@ -23,6 +23,7 @@
@@ -34,37 +34,28 @@ index 384c6836e2050ad8cfeaa4da3bf3365b5a3cf1a8..92a8d3dd4b6c82ee571ca2bf2d785870
  //! _IRR_SOLARIS_PLATFORM_ for Solaris
  //! _IRR_OSX_PLATFORM_ for Apple systems running OSX
  //! _IRR_IOS_PLATFORM_ for Apple devices running iOS
-@@ -94,11 +95,15 @@
- #endif
+@@ -98,7 +99,11 @@
+ #define _IRR_HAIKU_PLATFORM_
  #endif
  
--#if defined(HAIKU)
-+//#if defined(HAIKU)
- #define _IRR_HAIKU_PLATFORM_
-+//#endif
-+/*
+-#if defined(_IRR_HAIKU_PLATFORM_)
 +#if defined(__serenity__)
 +#define _IRR_SERENITY_PLATFORM_
- #endif
--
--#if defined(_IRR_HAIKU_PLATFORM_)
-+*/
++#endif
++
 +#if defined(_IRR_HAIKU_PLATFORM_) || defined(_IRR_SERENITY_PLATFORM_)
  #define _IRR_COMPILE_WITH_SDL_DEVICE_
  #define _IRR_COMPILE_WITH_OPENGL_
  #endif
-@@ -113,7 +118,10 @@
- #define _IRR_COMPILE_WITH_OGLES2_
+@@ -114,7 +119,7 @@
  #endif
  
--#if !defined(_IRR_WINDOWS_API_) && !defined(_IRR_OSX_PLATFORM_) && !defined(_IRR_ANDROID_PLATFORM_) && !defined(_IRR_HAIKU_PLATFORM_)
-+#define _IRR_POSIX_API_
-+
-+
-+#if !defined(_IRR_WINDOWS_API_) && !defined(_IRR_OSX_PLATFORM_) && !defined(_IRR_ANDROID_PLATFORM_) && !defined(_IRR_HAIKU_PLATFORM_) && !defined(_IRR_SERENITY_PLATFORM_)
- #ifndef _IRR_SOLARIS_PLATFORM_
+ #if !defined(_IRR_WINDOWS_API_) && !defined(_IRR_OSX_PLATFORM_) && !defined(_IRR_ANDROID_PLATFORM_) && !defined(_IRR_HAIKU_PLATFORM_)
+-#ifndef _IRR_SOLARIS_PLATFORM_
++#if !defined(_IRR_SOLARIS_PLATFORM_) && !defined(_IRR_SERENITY_PLATFORM_)
  #define _IRR_LINUX_PLATFORM_
  #endif
+ #define _IRR_POSIX_API_
 diff --git a/lib/shaderc/third_party/spirv-tools/CMakeLists.txt b/lib/shaderc/third_party/spirv-tools/CMakeLists.txt
 index 2a06a9ca39a61f5f3b618dc3f5655889a9dd38f4..e471b0bacf1bb04dc4c545e8dad4db0f4209f930 100644
 --- a/lib/shaderc/third_party/spirv-tools/CMakeLists.txt