From 7932c098e83dd9481f89aaec487b402be6ac72c8 Mon Sep 17 00:00:00 2001 From: jens Date: Wed, 26 Apr 2023 14:45:54 +0200 Subject: [PATCH] - fixed uppercase in inclusion of MMReg.h - fixed _uuidof for MinGW --- sdk/juce/JUCE-3.1.1.patch | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/sdk/juce/JUCE-3.1.1.patch b/sdk/juce/JUCE-3.1.1.patch index 292f7d6..e9e3d7a 100644 --- a/sdk/juce/JUCE-3.1.1.patch +++ b/sdk/juce/JUCE-3.1.1.patch @@ -1,6 +1,34 @@ +diff -ruN temp/JUCE-3.1.1/modules/juce_audio_devices/juce_audio_devices.cpp ./JUCE-3.1.1/modules/juce_audio_devices/juce_audio_devices.cpp +--- temp/JUCE-3.1.1/modules/juce_audio_devices/juce_audio_devices.cpp 2014-12-16 18:21:34.000000000 +0100 ++++ ./JUCE-3.1.1/modules/juce_audio_devices/juce_audio_devices.cpp 2023-04-26 08:14:41.666152289 +0200 +@@ -57,7 +57,7 @@ + //============================================================================== + #elif JUCE_WINDOWS + #if JUCE_WASAPI +- #include ++ #include + #endif + + #if JUCE_ASIO +diff -ruN temp/JUCE-3.1.1/modules/juce_core/native/juce_win32_ComSmartPtr.h ./JUCE-3.1.1/modules/juce_core/native/juce_win32_ComSmartPtr.h +--- temp/JUCE-3.1.1/modules/juce_core/native/juce_win32_ComSmartPtr.h 2014-12-16 18:21:34.000000000 +0100 ++++ ./JUCE-3.1.1/modules/juce_core/native/juce_win32_ComSmartPtr.h 2023-04-26 10:03:37.984191907 +0200 +@@ -29,8 +29,11 @@ + #ifndef JUCE_WIN32_COMSMARTPTR_H_INCLUDED + #define JUCE_WIN32_COMSMARTPTR_H_INCLUDED + +-#if ! (defined (_MSC_VER) || defined (__uuidof)) ++#if ! (defined (_MSC_VER) || defined (__uuidof)) || JUCE_MINGW + template struct UUIDGetter { static CLSID get() { jassertfalse; return CLSID(); } }; ++#if defined (__uuidof) ++#undef __uuidof ++#endif + #define __uuidof(x) UUIDGetter::get() + #endif + diff -ruN temp/JUCE-3.1.1/modules/juce_graphics/colour/juce_PixelFormats.h ./JUCE-3.1.1/modules/juce_graphics/colour/juce_PixelFormats.h --- temp/JUCE-3.1.1/modules/juce_graphics/colour/juce_PixelFormats.h 2014-12-16 18:21:34.000000000 +0100 -+++ ./JUCE-3.1.1/modules/juce_graphics/colour/juce_PixelFormats.h 2019-11-21 22:19:22.278775419 +0100 ++++ ./JUCE-3.1.1/modules/juce_graphics/colour/juce_PixelFormats.h 2023-04-21 14:46:27.766169460 +0200 @@ -86,19 +86,6 @@ forcedinline uint8 getGreen() const noexcept { return components.g; } forcedinline uint8 getBlue() const noexcept { return components.b; }