RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 12:37:44 +00:00
Code Issues Activity Actions

Ports/SuperTuxKart: Clean up IrrCompileConfig.h patch a little

Browse source 
There was still some code commented out from earlier attempts
piggybacking on Haiku ifdefs, this should now be in an upstreamable
state.
This commit is contained in:
Linus Groh 2023-07-04 16:45:24 +01:00
parent fc6cf76b05
commit 5c75117262
1 changed files with 15 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Ports/SuperTuxKart/patches/0001-Add-build-system-support-for-Serenity.patch
View file

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