Permalink
Browse files

Updated Xcode project for 4.2.1

Project is now in the 3.2 compatible format
Swapped compiler to Apple clang 3.0
Selected C99 and C++0x standards for compilation
Fixed harmless warnings (typedefs not declaring anything, unclear parentheses, nested comments, etc.)
Builds successfully on Mac OS X x86_64
  • Loading branch information...
1 parent c69a493 commit 59886614f282e92462d2ed7a681204e41701e069 @todayman committed Jan 1, 2012
@@ -34,8 +34,8 @@
// Core Text forward declarations
#if defined( CINDER_COCOA )
-typedef struct __CTFrame;
-typedef struct __CTLine;
+struct __CTFrame;
+struct __CTLine;
#endif
namespace cinder {
@@ -183,7 +183,7 @@ class XmlTree {
};
//! Enum listing all types of XML nodes understood by the parser.
- typedef enum NodeType { NODE_UNKNOWN, NODE_DOCUMENT, NODE_ELEMENT, NODE_CDATA, NODE_COMMENT };
+ enum NodeType { NODE_UNKNOWN, NODE_DOCUMENT, NODE_ELEMENT, NODE_CDATA, NODE_COMMENT };
//! Default constructor, creating an empty node.
XmlTree() : mParent( 0 ), mNodeType( NODE_ELEMENT ) {}
@@ -5940,7 +5940,7 @@ bool CTwBar::MouseButton(ETwMouseButtonID _Button, bool _Pressed, int _X, int _Y
}
else if( _Pressed && !m_MouseDrag && m_Movable && !m_IsPopupList
&& ( (_Button==TW_MOUSE_LEFT && _X>=m_PosX+2*m_Font->m_CharHeight && _X<m_PosX+m_Width-2*m_Font->m_CharHeight && _Y>=m_PosY && _Y<m_PosY+m_Font->m_CharHeight)
- || _Button==TW_MOUSE_MIDDLE && _X>=m_PosX && _X<m_PosX+m_Width && _Y>=m_PosY && _Y<m_PosY+m_Height) )
+ || (_Button==TW_MOUSE_MIDDLE && _X>=m_PosX && _X<m_PosX+m_Width && _Y>=m_PosY && _Y<m_PosY+m_Height)) )
{
m_MouseDrag = true;
m_MouseDragTitle = true;
@@ -802,7 +802,7 @@ void ScaledFont::textExtents( const char *utf8, TextExtents *extents )
cairo_scaled_font_text_extents( mCairoScaledFont, utf8, extents->getCairoTextExtents() );
}
-/*void ScaledFont::glyphExents( const Glyph *glyphs, int32_t num_glyphs )
+void ScaledFont::glyphExents( const Glyph *glyphs, int32_t num_glyphs )
{
cairo_scaled_font_glyph_extents( mCairoScaledFont, const_cast<Glyph *>( glyphs )->getCairoGlyph(), num_glyphs );
}
@@ -156,7 +156,7 @@ Surface8u convertNsBitmapDataRep( const NSBitmapImageRep *rep, bool assumeOwners
result.setDeallocator( NSBitmapImageRepSurfaceDeallocator, const_cast<NSBitmapImageRep*>( rep ) );
return result;
}
-#endif defined( CINDER_MAC )
+#endif // defined( CINDER_MAC )
std::string convertCfString( CFStringRef str )
{
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 45;
+ objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
@@ -1965,8 +1965,11 @@
/* Begin PBXProject section */
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0420;
+ };
buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "cinder" */;
- compatibilityVersion = "Xcode 3.1";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -2283,7 +2286,6 @@
CHECKED_STL = "-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -2345,7 +2347,6 @@
CHECKED_STL = "-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -2403,14 +2404,12 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = i386;
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CHECKED_STL = "-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC";
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_ENABLE_OBJC_GC = unsupported;
- GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = cinder_Prefix.pch;
@@ -2431,22 +2430,20 @@
);
PRODUCT_NAME = cinder_d;
SDKROOT = "";
- VALID_ARCHS = i386;
};
name = Debug;
};
1DEB922008733DC00010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = i386;
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_DEBUGGING_SYMBOLS = full;
GCC_ENABLE_OBJC_GC = unsupported;
GCC_FAST_MATH = YES;
- GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 3;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = cinder_Prefix.pch;
@@ -2468,18 +2465,19 @@
);
PRODUCT_NAME = cinder;
SDKROOT = "";
- VALID_ARCHS = i386;
};
name = Release;
};
1DEB922308733DC00010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)";
+ GCC_C_LANGUAGE_STANDARD = c99;
GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
GCC_OBJC_CALL_CXX_CDTORS = YES;
- GCC_VERSION = "";
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
@@ -2489,7 +2487,6 @@
);
OBJROOT = build/;
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
- PREBINDING = NO;
SYMROOT = ../lib;
USER_HEADER_SEARCH_PATHS = ../include;
};
@@ -2499,10 +2496,12 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)";
+ GCC_C_LANGUAGE_STANDARD = c99;
GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
GCC_OBJC_CALL_CXX_CDTORS = YES;
- GCC_VERSION = "";
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
@@ -2512,7 +2511,6 @@
);
OBJROOT = build/;
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
- PREBINDING = NO;
SYMROOT = ../lib;
USER_HEADER_SEARCH_PATHS = ../include;
};

0 comments on commit 5988661

Please sign in to comment.