Browse Source

Minor iphone compile tweaks.

tags/2021-05-28
Julian Storer 15 years ago
parent
commit
06cd5f5ed1
8 changed files with 11647 additions and 11632 deletions
  1. +1
    -1
      amalgamation/juce_amalgamated_template.cpp
  2. +1
    -1
      extras/Jucer (experimental)/Source/Application/jucer_Application.h
  3. +11630
    -11626
      juce_amalgamated.cpp
  4. +5
    -2
      juce_amalgamated.h
  5. +5
    -0
      src/core/juce_Atomic.h
  6. +1
    -1
      src/core/juce_StandardHeader.h
  7. +4
    -0
      src/events/juce_MessageManager.cpp
  8. +0
    -1
      src/gui/graphics/geometry/juce_RelativeCoordinate.h

+ 1
- 1
amalgamation/juce_amalgamated_template.cpp View File

@@ -319,6 +319,7 @@
#include "../src/gui/components/windows/juce_ThreadWithProgressWindow.cpp" #include "../src/gui/components/windows/juce_ThreadWithProgressWindow.cpp"
#include "../src/gui/components/windows/juce_TooltipWindow.cpp" #include "../src/gui/components/windows/juce_TooltipWindow.cpp"
#include "../src/gui/components/windows/juce_TopLevelWindow.cpp" #include "../src/gui/components/windows/juce_TopLevelWindow.cpp"
#include "../src/gui/graphics/geometry/juce_RelativeCoordinate.cpp"
#endif #endif
#if JUCE_BUILD_MISC // (put these in misc to balance the file sizes and avoid problems in iphone build) #if JUCE_BUILD_MISC // (put these in misc to balance the file sizes and avoid problems in iphone build)
@@ -352,7 +353,6 @@
#include "../src/gui/graphics/geometry/juce_PathStrokeType.cpp" #include "../src/gui/graphics/geometry/juce_PathStrokeType.cpp"
#include "../src/gui/graphics/geometry/juce_PositionedRectangle.cpp" #include "../src/gui/graphics/geometry/juce_PositionedRectangle.cpp"
#include "../src/gui/graphics/geometry/juce_RectangleList.cpp" #include "../src/gui/graphics/geometry/juce_RectangleList.cpp"
#include "../src/gui/graphics/geometry/juce_RelativeCoordinate.cpp"
#include "../src/gui/graphics/imaging/juce_Image.cpp" #include "../src/gui/graphics/imaging/juce_Image.cpp"
#include "../src/gui/graphics/imaging/juce_ImageCache.cpp" #include "../src/gui/graphics/imaging/juce_ImageCache.cpp"
#include "../src/gui/graphics/imaging/juce_ImageConvolutionKernel.cpp" #include "../src/gui/graphics/imaging/juce_ImageConvolutionKernel.cpp"


+ 1
- 1
extras/Jucer (experimental)/Source/Application/jucer_Application.h View File

@@ -292,7 +292,7 @@ public:
commands.addArray (ids, numElementsInArray (ids)); commands.addArray (ids, numElementsInArray (ids));
} }
void getCommandInfo (const CommandID commandID, ApplicationCommandInfo& result)
void getCommandInfo (CommandID commandID, ApplicationCommandInfo& result)
{ {
switch (commandID) switch (commandID)
{ {


+ 11630
- 11626
juce_amalgamated.cpp
File diff suppressed because it is too large
View File


+ 5
- 2
juce_amalgamated.h View File

@@ -64,7 +64,7 @@
*/ */
#define JUCE_MAJOR_VERSION 1 #define JUCE_MAJOR_VERSION 1
#define JUCE_MINOR_VERSION 52 #define JUCE_MINOR_VERSION 52
#define JUCE_BUILDNUMBER 33
#define JUCE_BUILDNUMBER 34


/** Current Juce version number. /** Current Juce version number.


@@ -5870,6 +5870,10 @@ public:
#elif JUCE_GCC #elif JUCE_GCC
#define JUCE_ATOMICS_GCC 1 // GCC with intrinsics #define JUCE_ATOMICS_GCC 1 // GCC with intrinsics


#if JUCE_IPHONE
#define JUCE_64BIT_ATOMICS_UNAVAILABLE 1 // (on the iphone, the 64-bit ops will compile but not link)
#endif

#else #else
#define JUCE_ATOMICS_WINDOWS 1 // Windows with intrinsics #define JUCE_ATOMICS_WINDOWS 1 // Windows with intrinsics


@@ -42704,7 +42708,6 @@ public:
/** Creates an absolute position from the parent origin on either the X or Y axis. /** Creates an absolute position from the parent origin on either the X or Y axis.


@param absoluteDistanceFromOrigin the distance from the origin @param absoluteDistanceFromOrigin the distance from the origin
@param isHorizontal this must be true if this is an X coordinate, or false if it's on the Y axis.
*/ */
RelativeCoordinate (double absoluteDistanceFromOrigin); RelativeCoordinate (double absoluteDistanceFromOrigin);




+ 5
- 0
src/core/juce_Atomic.h View File

@@ -169,6 +169,11 @@ public:
//============================================================================== //==============================================================================
#elif JUCE_GCC #elif JUCE_GCC
#define JUCE_ATOMICS_GCC 1 // GCC with intrinsics #define JUCE_ATOMICS_GCC 1 // GCC with intrinsics
#if JUCE_IPHONE
#define JUCE_64BIT_ATOMICS_UNAVAILABLE 1 // (on the iphone, the 64-bit ops will compile but not link)
#endif
//============================================================================== //==============================================================================
#else #else
#define JUCE_ATOMICS_WINDOWS 1 // Windows with intrinsics #define JUCE_ATOMICS_WINDOWS 1 // Windows with intrinsics


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

@@ -33,7 +33,7 @@
*/ */
#define JUCE_MAJOR_VERSION 1 #define JUCE_MAJOR_VERSION 1
#define JUCE_MINOR_VERSION 52 #define JUCE_MINOR_VERSION 52
#define JUCE_BUILDNUMBER 33
#define JUCE_BUILDNUMBER 34
/** Current Juce version number. /** Current Juce version number.


+ 4
- 0
src/events/juce_MessageManager.cpp View File

@@ -60,6 +60,10 @@ MessageManager::~MessageManager() throw()
doPlatformSpecificShutdown(); doPlatformSpecificShutdown();
// If you hit this assertion, then you've probably leaked a Component or some other
// kind of MessageListener object...
jassert (messageListeners.size() == 0);
jassert (instance == this); jassert (instance == this);
instance = 0; // do this last in case this instance is still needed by doPlatformSpecificShutdown() instance = 0; // do this last in case this instance is still needed by doPlatformSpecificShutdown()
} }


+ 0
- 1
src/gui/graphics/geometry/juce_RelativeCoordinate.h View File

@@ -62,7 +62,6 @@ public:
/** Creates an absolute position from the parent origin on either the X or Y axis. /** Creates an absolute position from the parent origin on either the X or Y axis.
@param absoluteDistanceFromOrigin the distance from the origin @param absoluteDistanceFromOrigin the distance from the origin
@param isHorizontal this must be true if this is an X coordinate, or false if it's on the Y axis.
*/ */
RelativeCoordinate (double absoluteDistanceFromOrigin); RelativeCoordinate (double absoluteDistanceFromOrigin);


Loading…
Cancel
Save