Browse Source

Fix for mac font use with the 10.5 SDK.

tags/2021-05-28
Julian Storer 14 years ago
parent
commit
06d2fe4887
5 changed files with 10 additions and 7 deletions
  1. +4
    -2
      juce_amalgamated.cpp
  2. +2
    -2
      juce_amalgamated.h
  3. +1
    -1
      src/core/juce_StandardHeader.h
  4. +1
    -1
      src/memory/juce_WeakReference.h
  5. +2
    -1
      src/native/mac/juce_mac_Fonts.mm

+ 4
- 2
juce_amalgamated.cpp View File

@@ -271956,7 +271956,8 @@ JUCE_API bool JUCE_CALLTYPE Process::isRunningUnderDebugger()
// compiled on its own).
#if JUCE_INCLUDED_FILE

#if (JUCE_MAC && defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) \
#if (JUCE_MAC && defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 \
&& MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5) \
|| (JUCE_IOS && defined (__IPHONE_3_0) && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_3_2)
#define JUCE_CORETEXT_AVAILABLE 1
#endif
@@ -276957,7 +276958,8 @@ MidiInput* MidiInput::openDevice (int index, MidiInputCallback* callback) { re
// compiled on its own).
#if JUCE_INCLUDED_FILE

#if (JUCE_MAC && defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) \
#if (JUCE_MAC && defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 \
&& MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5) \
|| (JUCE_IOS && defined (__IPHONE_3_0) && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_3_2)
#define JUCE_CORETEXT_AVAILABLE 1
#endif


+ 2
- 2
juce_amalgamated.h View File

@@ -73,7 +73,7 @@ namespace JuceDummyNamespace {}
*/
#define JUCE_MAJOR_VERSION 1
#define JUCE_MINOR_VERSION 53
#define JUCE_BUILDNUMBER 80
#define JUCE_BUILDNUMBER 81

/** Current Juce version number.

@@ -21599,7 +21599,7 @@ class WeakReference
{
public:
/** Creates a null SafePointer. */
WeakReference() noexcept {}
inline WeakReference() noexcept {}

/** Creates a WeakReference that points at the given object. */
WeakReference (ObjectType* const object) : holder (object != nullptr ? object->getWeakReference() : nullptr) {}


+ 1
- 1
src/core/juce_StandardHeader.h View File

@@ -33,7 +33,7 @@
*/
#define JUCE_MAJOR_VERSION 1
#define JUCE_MINOR_VERSION 53
#define JUCE_BUILDNUMBER 80
#define JUCE_BUILDNUMBER 81
/** Current Juce version number.


+ 1
- 1
src/memory/juce_WeakReference.h View File

@@ -86,7 +86,7 @@ class WeakReference
{
public:
/** Creates a null SafePointer. */
WeakReference() noexcept {}
inline WeakReference() noexcept {}
/** Creates a WeakReference that points at the given object. */
WeakReference (ObjectType* const object) : holder (object != nullptr ? object->getWeakReference() : nullptr) {}


+ 2
- 1
src/native/mac/juce_mac_Fonts.mm View File

@@ -27,7 +27,8 @@
// compiled on its own).
#if JUCE_INCLUDED_FILE
#if (JUCE_MAC && defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) \
#if (JUCE_MAC && defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 \
&& MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5) \
|| (JUCE_IOS && defined (__IPHONE_3_0) && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_3_2)
#define JUCE_CORETEXT_AVAILABLE 1
#endif


Loading…
Cancel
Save