mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Fix for iphone atomics on older SDKs.

Browse source
This commit is contained in:
Julian Storer 2010-04-29 12:25:28 +01:00
parent 636ed22863
commit db2224b209
4 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
amalgamation/juce_amalgamated_template.cpp
View file

@ -316,6 +316,9 @@
#include "../src/gui/components/windows/juce_ThreadWithProgressWindow.cpp"
#include "../src/gui/components/windows/juce_TooltipWindow.cpp"
#include "../src/gui/components/windows/juce_TopLevelWindow.cpp"
#endif
#if JUCE_BUILD_MISC // (put these in misc to balance the file sizes and avoid problems in iphone build)
#include "../src/gui/graphics/colour/juce_Colour.cpp"
#include "../src/gui/graphics/colour/juce_ColourGradient.cpp"
#include "../src/gui/graphics/colour/juce_Colours.cpp"

4
juce_amalgamated.cpp
View file

@ -77777,6 +77777,9 @@ TopLevelWindow* TopLevelWindow::getActiveTopLevelWindow() throw()
END_JUCE_NAMESPACE
/*** End of inlined file: juce_TopLevelWindow.cpp ***/
#endif
#if JUCE_BUILD_MISC // (put these in misc to balance the file sizes and avoid problems in iphone build)
/*** Start of inlined file: juce_Colour.cpp ***/
BEGIN_JUCE_NAMESPACE
@ -78284,6 +78287,7 @@ END_JUCE_NAMESPACE
/*** End of inlined file: juce_Colour.cpp ***/
/*** Start of inlined file: juce_ColourGradient.cpp ***/
BEGIN_JUCE_NAMESPACE

3
juce_amalgamated.h
View file

@ -3136,7 +3136,8 @@ private:
Atomic& operator= (const Atomic&);
};
#if JUCE_MAC && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2)) // Older Mac builds using gcc4.1 or earlier...
#if (JUCE_IPHONE && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_3_2 || ! defined (__IPHONE_3_2))) \
|| (JUCE_MAC && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2))) // Older OSX builds using gcc4.1 or earlier...
inline void Atomic::increment (int32& variable) { OSAtomicIncrement32 (static_cast <int32_t*> (&variable)); }
inline int32 Atomic::incrementAndReturn (int32& variable) { return OSAtomicIncrement32 (static_cast <int32_t*> (&variable)); }

3
src/core/juce_Atomic.h
View file

@ -62,7 +62,8 @@ private:
//==============================================================================
#if JUCE_MAC && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2)) // Older Mac builds using gcc4.1 or earlier...
#if (JUCE_IPHONE && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_3_2 || ! defined (__IPHONE_3_2))) \
|| (JUCE_MAC && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2))) // Older OSX builds using gcc4.1 or earlier...
inline void Atomic::increment (int32& variable) { OSAtomicIncrement32 (static_cast <int32_t*> (&variable)); }
inline int32 Atomic::incrementAndReturn (int32& variable) { return OSAtomicIncrement32 (static_cast <int32_t*> (&variable)); }