mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-07 04:10:08 +00:00
Code Activity

Minor iphone compile tweaks.

Browse source
This commit is contained in:
Julian Storer 2010-07-02 16:29:21 +01:00
parent 258414bad2
commit 06cd5f5ed1
8 changed files with 920 additions and 905 deletions
Download patch file Download diff file Expand all files Collapse all files

2
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_TooltipWindow.cpp"
#include "../src/gui/components/windows/juce_TopLevelWindow.cpp"
#include "../src/gui/graphics/geometry/juce_RelativeCoordinate.cpp"
#endif
#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_PositionedRectangle.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_ImageCache.cpp"
#include "../src/gui/graphics/imaging/juce_ImageConvolutionKernel.cpp"

2
extras/Jucer (experimental)/Source/Application/jucer_Application.h
View file

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

1802
juce_amalgamated.cpp
View file

File diff suppressed because it is too large Load diff

7
juce_amalgamated.h
View file

@ -64,7 +64,7 @@
*/
#define JUCE_MAJOR_VERSION 1
#define JUCE_MINOR_VERSION 52
#define JUCE_BUILDNUMBER 33
#define JUCE_BUILDNUMBER 34
/** Current Juce version number.
@ -5870,6 +5870,10 @@ public:
#elif JUCE_GCC
#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
#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.
@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);

5
src/core/juce_Atomic.h
View file

@ -169,6 +169,11 @@ public:
//==============================================================================
#elif JUCE_GCC
#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
#define JUCE_ATOMICS_WINDOWS 1 // Windows with intrinsics

2
src/core/juce_StandardHeader.h
View file

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

4
src/events/juce_MessageManager.cpp
View file

@ -60,6 +60,10 @@ MessageManager::~MessageManager() throw()
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);
instance = 0; // do this last in case this instance is still needed by doPlatformSpecificShutdown()
}

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.
@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);