fix to build; enable only active arch in Debug

git-svn-id: https://svn.r-project.org/R-packages/trunk/Mac-GUI@6089 694ef91d-65df-0310-b7bb-92e67a308ead
R-macos · Feb 17, 2012 · 6e6a102 · 6e6a102
1 parent 847f0ab
commit 6e6a102
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/R.xcodeproj/project.pbxproj b/R.xcodeproj/project.pbxproj
@@ -1942,6 +1942,7 @@
 		680F0B3D0997CE66009CDBE8 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)";
 				COPY_PHASE_STRIP = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = USE_POOLS;
 				HEADER_SEARCH_PATHS = (
@@ -1953,6 +1954,7 @@
 				INFOPLIST_PREPROCESS = YES;
 				INFOPLIST_PREPROCESSOR_DEFINITIONS = "DEBUG_CFG=1";
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks /Library/Frameworks";
+				ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)";
 				STRINGS_FILE_OUTPUT_ENCODING = "UTF-8";
 				STRIP_INSTALLED_PRODUCT = NO;
 			};

diff --git a/RController.m b/RController.m
@@ -2925,7 +2925,7 @@ - (void) handlePromptRdFileAtPath:(NSString*)filepath isTempFile:(BOOL)isTempFil
 			}
 		} else {
 			NSError *err = nil;
-			SLog(@"RController:handlePromptRdFileAtPath opens untitled Rd file for '%@>'", [url absoluteString]);
+			SLog(@"RController:handlePromptRdFileAtPath opens untitled Rd file for '%@>'", filepath);
 			RDocumentController *ctrl = [RDocumentController sharedDocumentController];
 			RDocument *doc = [ctrl makeUntitledDocumentOfType:ftRdDoc error:&err];
 			if(err != nil) {

diff --git a/RDocument.m b/RDocument.m
@@ -186,7 +186,7 @@ - (BOOL)prepareSavePanel:(NSSavePanel *)savePanel
 - (BOOL)writeToURL:(NSURL *)absoluteURL ofType:(NSString *)docType error:(NSError **)outError
 {
 
-	SLog(@"RDocument.writeToFile: %@ ofType: %@ ", fileName, docType);
+	SLog(@"RDocument.writeToFile: %@ ofType: %@ ", absoluteURL, docType);
 
 	NSString *oldFileType = (initialContentsType)?:ftRSource;