jens/JaySynth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fixed uppercase in inclusion of MMReg.h

Browse Source 
- fixed _uuidof for MinGW
This commit is contained in:
jens
2023-04-26 14:45:54 +02:00
parent b4f4b1fa66
commit 7932c098e8
1 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdk/juce/JUCE-3.1.1.patch
+29 -1
View File
@@ -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 <MMReg.h>
+ #include <mmreg.h>
#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<typename Type> struct UUIDGetter { static CLSID get() { jassertfalse; return CLSID(); } };
+#if defined (__uuidof)
+#undef __uuidof
+#endif
#define __uuidof(x) UUIDGetter<x>::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 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 --- 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 @@ @@ -86,19 +86,6 @@
forcedinline uint8 getGreen() const noexcept { return components.g; } forcedinline uint8 getGreen() const noexcept { return components.g; }
forcedinline uint8 getBlue() const noexcept { return components.b; } forcedinline uint8 getBlue() const noexcept { return components.b; }