updated targets (all libs, iOS/Mac) to use ARC.

creaceed · Jul 30, 2014 · 1adedbc · 1adedbc
1 parent 2a45a44
commit 1adedbc
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 102 deletions.
diff --git a/CeedGL.xcodeproj/project.pbxproj b/CeedGL.xcodeproj/project.pbxproj
@@ -151,7 +151,6 @@
 		052BD76D127ECC3A005A3AE9 /* GLTexture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = GLTexture.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		052BD76F127ECC56005A3AE9 /* GLTexture.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GLTexture.m; sourceTree = "<group>"; };
 		052BD772127ECEB1005A3AE9 /* GLFramebuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = GLFramebuffer.h; sourceTree = "<group>"; };
-		0538C9DD154C264000D305EC /* CeedGLDemo.ios.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = CeedGLDemo.ios.entitlements; sourceTree = "<group>"; };
 		0592DB821286AF810030F780 /* GLPlatform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GLPlatform.h; sourceTree = "<group>"; };
 		0592DBEE1286B2D70030F780 /* CeedGL-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "CeedGL-Info.plist"; path = "Mac/CeedGL-Info.plist"; sourceTree = "<group>"; };
 		05BE5871128553040054FD91 /* CeedGLDemo.mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CeedGLDemo.mac.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -317,7 +316,6 @@
 		052BD747127ECB10005A3AE9 = {
 			isa = PBXGroup;
 			children = (
-				0538C9DD154C264000D305EC /* CeedGLDemo.ios.entitlements */,
 				052BD74E127ECB10005A3AE9 /* Sources */,
 				050DB8441489179C00812267 /* Mac */,
 				050DB845148917BC00812267 /* iOS */,
@@ -817,6 +815,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -841,6 +840,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -860,6 +860,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD)";
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -884,6 +885,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD)";
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = iOS/CeedGL_Prefix.pch;
@@ -902,9 +904,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				CODE_SIGN_ENTITLEMENTS = CeedGLDemo.ios.entitlements;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				ARCHS = "$(ARCHS_STANDARD)";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -918,6 +919,7 @@
 				INFOPLIST_FILE = "iOS/CeedGLDemo/CeedGLDemo-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "";
 				SDKROOT = iphoneos;
 				WRAPPER_EXTENSION = app;
 			};
@@ -927,9 +929,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				CODE_SIGN_ENTITLEMENTS = CeedGLDemo.ios.entitlements;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				ARCHS = "$(ARCHS_STANDARD)";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = iOS/CeedGLDemo/CeedGLDemo_Prefix.pch;
@@ -938,6 +939,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 				WRAPPER_EXTENSION = app;
@@ -982,6 +984,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -1001,6 +1004,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD)";
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = iOS/CeedGL_Prefix.pch;
@@ -1032,7 +1036,7 @@
 				GCC_PREFIX_HEADER = Mac/CeedGLDemo/CeedGLDemo_Prefix.pch;
 				INFOPLIST_FILE = "Mac/CeedGLDemo/CeedGLDemo-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -1042,9 +1046,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				CODE_SIGN_ENTITLEMENTS = CeedGLDemo.ios.entitlements;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				ARCHS = "$(ARCHS_STANDARD)";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = iOS/CeedGLDemo/CeedGLDemo_Prefix.pch;
@@ -1053,6 +1056,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 				WRAPPER_EXTENSION = app;
@@ -1168,6 +1172,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -1187,6 +1192,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD)";
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = iOS/CeedGL_Prefix.pch;
@@ -1218,7 +1224,7 @@
 				GCC_PREFIX_HEADER = Mac/CeedGLDemo/CeedGLDemo_Prefix.pch;
 				INFOPLIST_FILE = "Mac/CeedGLDemo/CeedGLDemo-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -1228,9 +1234,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				CODE_SIGN_ENTITLEMENTS = CeedGLDemo.ios.entitlements;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				ARCHS = "$(ARCHS_STANDARD)";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = iOS/CeedGLDemo/CeedGLDemo_Prefix.pch;
@@ -1239,6 +1244,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 				WRAPPER_EXTENSION = app;
@@ -1262,7 +1268,7 @@
 				GCC_PREFIX_HEADER = Mac/CeedGLDemo/CeedGLDemo_Prefix.pch;
 				INFOPLIST_FILE = "Mac/CeedGLDemo/CeedGLDemo-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -1285,7 +1291,7 @@
 				GCC_PREFIX_HEADER = Mac/CeedGLDemo/CeedGLDemo_Prefix.pch;
 				INFOPLIST_FILE = "Mac/CeedGLDemo/CeedGLDemo-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};

diff --git a/CeedGLDemo.ios.entitlements b/CeedGLDemo.ios.entitlements
diff --git a/Sources/GLBuffer.m b/Sources/GLBuffer.m
@@ -15,7 +15,7 @@ @implementation GLBuffer
 
 + (GLBuffer*)buffer
 {
-	return [[[self alloc] init] autorelease];
+	return [[self alloc] init];
 }
 
 - (id)init {
@@ -28,13 +28,10 @@ - (id)init {
 
 - (void)dealloc {
     // Clean-up code here.
-
 	if(mHandle && mHandleOwner == nil)
 	{
 		GLLog(@"warning: handle not destroyed");
 	}
-
-    [super dealloc];
 }
 
 #pragma mark -

diff --git a/Sources/GLDrawCommand.m b/Sources/GLDrawCommand.m
@@ -19,7 +19,7 @@ @implementation GLDrawCommand
 
 + (GLDrawCommand*)drawCommand
 {
-	return [[[self alloc] init] autorelease];
+	return [[self alloc] init];
 }
 
 - (id)init {
@@ -35,23 +35,15 @@ - (id)init {
 }
 
 - (void)dealloc {
-	[mTextures release];
-	[mAttributes release];
-	[mUniforms release];
-	[mElementIndexes release];
-
 	self.program = nil;
-
-    [super dealloc];
 }
 
 #pragma mark Indexes
 - (void)setElementIndexes:(GLBuffer*)buffer type:(GLenum)type
 {
 	GL_EXCEPT(type != GL_UNSIGNED_BYTE && type != GL_UNSIGNED_SHORT && type != GL_UNSIGNED_INT, NSInvalidArgumentException);
 
-	[mElementIndexes autorelease];
-	mElementIndexes = [buffer retain];
+	mElementIndexes = buffer;
 	mElementIndexType = type;
 }
 

diff --git a/Sources/GLFramebuffer.m b/Sources/GLFramebuffer.m
@@ -21,17 +21,10 @@ - (id)init {
     return self;
 }
 
-- (void)dealloc {
-    // Clean-up code here.
-
-	[mAttachments release];
-
-    [super dealloc];
-}
 
 + (GLFramebuffer*)framebuffer
 {
-	return [[[self alloc] init] autorelease];
+	return [[self alloc] init];
 }
 
 #pragma mark -

diff --git a/Sources/GLObject.m b/Sources/GLObject.m
@@ -25,8 +25,6 @@ - (id)init {
 - (void)dealloc {
     // Clean-up code here.
 	self.handleOwner = nil;
-
-    [super dealloc];
 }
 
 - (void)createHandle
@@ -46,8 +44,7 @@ - (void)setHandleOwner:(id)handleOwner
 {
 	if(handleOwner != mHandleOwner)
 	{
-		[mHandleOwner release];
-		mHandleOwner = [handleOwner retain];
+		mHandleOwner = handleOwner;
 	}
 }
 - (id)handleOwner {

diff --git a/Sources/GLProgram.m b/Sources/GLProgram.m
@@ -13,7 +13,7 @@ @implementation GLProgram
 
 + (GLProgram*)program
 {
-	return [[[self alloc] init] autorelease];
+	return [[self alloc] init];
 }
 
 - (id)init {
@@ -27,15 +27,6 @@ - (id)init {
     return self;
 }
 
-- (void)dealloc {
-    [mAttachedShaders release];
-	[mUniformLookup release];
-	[mAttribLookup release];
-
-
-    [super dealloc];
-}
-
 #pragma mark -
 #pragma mark Handle creation/destruction
 - (void)createHandle

diff --git a/Sources/GLRenderbuffer.m b/Sources/GLRenderbuffer.m
@@ -21,12 +21,6 @@ - (id)init {
     return self;
 }
 
-- (void)dealloc {
-    // Clean-up code here.
-
-    [super dealloc];
-}
-
 #pragma mark -
 #pragma mark Handle creation/destruction
 - (void)createHandle

diff --git a/Sources/GLShader.m b/Sources/GLShader.m
@@ -19,12 +19,6 @@ - (id)init {
 
     return self;
 }
-- (void)dealloc {
-    // Clean-up code here.
-    [mSource release];
-
-    [super dealloc];
-}
 - (GLShader*)initWithType:(GLenum)type
 {
     if ((self = [super init])) {
@@ -45,11 +39,11 @@ - (GLShader*)initFragmentShader
 
 + (GLShader*)vertexShader
 {
-	return [[[self alloc] initVertexShader] autorelease];
+	return [[self alloc] initVertexShader];
 }
 + (GLShader*)fragmentShader
 {
-	return [[[self alloc] initFragmentShader] autorelease];
+	return [[self alloc] initFragmentShader];
 }
 
 
@@ -83,8 +77,7 @@ - (void)setSource:(NSString*)source
 
 	if(mSource != source)
 	{
-		[mSource release];
-		mSource = [source retain];
+		mSource = source;
 	}
 }
 - (BOOL)compile:(NSError**)error

diff --git a/Sources/GLTexture.m b/Sources/GLTexture.m
@@ -27,11 +27,10 @@ - (void)dealloc {
 	{
 		GLLog(@"warning: handle not destroyed");
 	}
-    [super dealloc];
 }
 + (GLTexture*)texture
 {
-	return [[[self alloc] init] autorelease];
+	return [[self alloc] init];
 }