[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[sc-dev] SF.net SVN: supercollider:[9630] trunk

To: sc-dev@xxxxxxxxxxxxxxxx
Subject: [sc-dev] SF.net SVN: supercollider:[9630] trunk
From: axelballey@xxxxxxxxxxxxxxxxxxxxx
Date: Wed, 23 Dec 2009 11:25:48 +0000
List-id: SuperCollider developers mailing list <sc-devel.create.ucsb.edu>
Reply-to: sc-dev@xxxxxxxxxxxxxxxx
Sender: owner-sc-dev@xxxxxxxxxxxxxxxx

Revision: 9630
          http://supercollider.svn.sourceforge.net/supercollider/?rev=9630&view=rev
Author:   axelballey
Date:     2009-12-23 11:25:48 +0000 (Wed, 23 Dec 2009)

Log Message:
-----------
added NDEBUG definition to Release and Cydia targets in iPhone project
fixed some slot type assertion failures in iPhone port

Modified Paths:
--------------
    trunk/Source/app/iPhone/iPhoneGUIPrimitives.mm
    trunk/Source/app/iPhone/iPhoneSCView.mm
    trunk/iPhone_Language.xcodeproj/project.pbxproj

Modified: trunk/Source/app/iPhone/iPhoneGUIPrimitives.mm
===================================================================
--- trunk/Source/app/iPhone/iPhoneGUIPrimitives.mm	2009-12-23 03:21:37 UTC (rev 9629)
+++ trunk/Source/app/iPhone/iPhoneGUIPrimitives.mm	2009-12-23 11:25:48 UTC (rev 9630)
@@ -176,7 +176,7 @@
 		[scrollView autorelease];
 */
 	} else {
-		[view setSCTopView: (SCTopView*)slotRawInt(slotRawObject(f)->slots)];
+		[view setSCTopView: (SCTopView*)slotRawPtr(slotRawObject(f)->slots)];
 		[window addSubview: view];
 		[view autorelease];
 	}

Modified: trunk/Source/app/iPhone/iPhoneSCView.mm
===================================================================
--- trunk/Source/app/iPhone/iPhoneSCView.mm	2009-12-23 03:21:37 UTC (rev 9629)
+++ trunk/Source/app/iPhone/iPhoneSCView.mm	2009-12-23 11:25:48 UTC (rev 9630)
@@ -2281,7 +2281,7 @@
 
 	if (!IsSym(args+1)) return errWrongType;
 
-	SCView *view = (SCView*)slotRawInt(slotRawObject(&args[0])->slots);
+	SCView *view = (SCView*)slotRawPtr(slotRawObject(&args[0])->slots);
 	if (!view) return errFailed;
 
 	int err = view->setProperty(slotRawSymbol(&args[1]), args+2);
@@ -2301,7 +2301,7 @@
 
 	if (!IsSym(args+1)) return errWrongType;
 
-	SCView *view = (SCView*)slotRawInt(slotRawObject(&args[0])->slots);
+	SCView *view = (SCView*)slotRawPtr(slotRawObject(&args[0])->slots);
 	if (!view) return errFailed;
 
 	int err = view->getProperty(slotRawSymbol(&args[1]), args+2);
@@ -2320,7 +2320,7 @@
 	PyrSlot *a = g->sp - 1;
 	PyrSlot *b = g->sp;
 
-	SCView *view = (SCView*)slotRawInt(slotRawObject(a)->slots);
+	SCView *view = (SCView*)slotRawPtr(slotRawObject(a)->slots);
 	if (!view) return errFailed;
 
 	int32 tag;
@@ -2343,7 +2343,7 @@
 	if (!g->canCallOS) return errCantCallOS;
 
 	PyrSlot *viewObjSlot = g->sp - 1;
-	SCView *view = (SCView*)slotRawInt(slotRawObject(&viewObjSlot[0])->slots);
+	SCView *view = (SCView*)slotRawPtr(slotRawObject(&viewObjSlot[0])->slots);
 	PyrSlot *boo = g->sp;
 
 	if (!view) return errFailed;
@@ -2357,7 +2357,7 @@
 	if (!g->canCallOS) return errCantCallOS;
 
 	PyrSlot *viewObjSlot = g->sp;
-	SCView *view = (SCView*)slotRawInt(slotRawObject(&viewObjSlot[0])->slots);
+	SCView *view = (SCView*)slotRawPtr(slotRawObject(&viewObjSlot[0])->slots);
 
 	if (!view) return errFailed;
 	SetBool(viewObjSlot, view->isFocus());
@@ -2369,7 +2369,7 @@
 {
 	if (!g->canCallOS) return errCantCallOS;
 
-	SCView *view = (SCView*)slotRawInt(slotRawObject(g->sp)->slots);
+	SCView *view = (SCView*)slotRawPtr(slotRawObject(g->sp)->slots);
 	if(!view) 	return errNone;
 	view->refresh();
 	return errNone;
@@ -2380,7 +2380,7 @@
 {
 	if (!g->canCallOS) return errCantCallOS;
 	SCRect r;
-	SCView *view = (SCView*)slotRawInt(slotRawObject(&(g->sp - 1)[0])->slots);
+	SCView *view = (SCView*)slotRawPtr(slotRawObject(&(g->sp - 1)[0])->slots);
 
 	if(slotGetSCRect(g->sp, &r) != noErr)
 		return errFailed;
@@ -2395,7 +2395,7 @@
 	//if (!g->canCallOS) return errCantCallOS;
 
 	PyrSlot *viewObjSlot = g->sp;
-	SCView *view = (SCView*)slotRawInt(slotRawObject(&viewObjSlot[0])->slots);
+	SCView *view = (SCView*)slotRawPtr(slotRawObject(&viewObjSlot[0])->slots);
 	if (!view) return errFailed;
 
 	// removes from parent, set mObj to nil

Modified: trunk/iPhone_Language.xcodeproj/project.pbxproj
===================================================================
--- trunk/iPhone_Language.xcodeproj/project.pbxproj	2009-12-23 03:21:37 UTC (rev 9629)
+++ trunk/iPhone_Language.xcodeproj/project.pbxproj	2009-12-23 11:25:48 UTC (rev 9630)
@@ -106,8 +106,8 @@
 		778F18490F50B1D000CB6629 /* Common in CopyFiles */ = {isa = PBXBuildFile; fileRef = 778F18450F50B1D000CB6629 /* Common */; };
 		778F184A0F50B1D000CB6629 /* DefaultLibrary in CopyFiles */ = {isa = PBXBuildFile; fileRef = 778F18460F50B1D000CB6629 /* DefaultLibrary */; };
 		778F184B0F50B1D000CB6629 /* Platform in CopyFiles */ = {isa = PBXBuildFile; fileRef = 778F18470F50B1D000CB6629 /* Platform */; };
-		7795B81F10D6C0920053700A /* libsndfile_iphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 778F15180F50AB6B00CB6629 /* libsndfile_iphone.a */; };
 		77CF86040FC2212100C81F75 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 77CF86030FC2212100C81F75 /* CFNetwork.framework */; };
+		77D86FF210E235680024A880 /* libsndfile_iphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 778F15180F50AB6B00CB6629 /* libsndfile_iphone.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -468,7 +468,7 @@
 				7713C69E0F422BE400B0055E /* QuartzCore.framework in Frameworks */,
 				7713C69F0F422BE400B0055E /* MediaPlayer.framework in Frameworks */,
 				77CF86040FC2212100C81F75 /* CFNetwork.framework in Frameworks */,
-				7795B81F10D6C0920053700A /* libsndfile_iphone.a in Frameworks */,
+				77D86FF210E235680024A880 /* libsndfile_iphone.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1208,7 +1208,10 @@
 				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
-				GCC_PREPROCESSOR_DEFINITIONS = SC_IPHONE;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					SC_IPHONE,
+					NDEBUG,
+				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				GCC_THUMB_SUPPORT = NO;
 				GCC_UNROLL_LOOPS = YES;
@@ -1252,7 +1255,10 @@
 				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
-				GCC_PREPROCESSOR_DEFINITIONS = SC_IPHONE;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					SC_IPHONE,
+					NDEBUG,
+				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				GCC_THUMB_SUPPORT = NO;
 				GCC_UNROLL_LOOPS = YES;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: https://listarc.bham.ac.uk/marchives/sc-dev/
search: https://listarc.bham.ac.uk/lists/sc-dev/search/

Prev by Date: [sc-dev] SF.net SVN: supercollider:[9629] trunk/build/Help/UGens/Synth control/ Demand Rate
Next by Date: Re: Attn Tim Re: [sc-dev] trying to build sc for iPhone
Previous by thread: [sc-dev] SF.net SVN: supercollider:[9629] trunk/build/Help/UGens/Synth control/ Demand Rate
Next by thread: [sc-dev] another minor JSCTextView issue
Index(es):
- Date
- Thread