[Unison-hackers] [unison-svn] r535 - in branches/2.48/src/uimac14: . uimacnew.xcodeproj

[schmitta at seas.upenn.edu]

Author: schmitta
Date: 2014-10-23 02:49:38 -0400 (Thu, 23 Oct 2014)
New Revision: 535

Modified:
   branches/2.48/src/uimac14/cltool.c
   branches/2.48/src/uimac14/uimacnew.xcodeproj/project.pbxproj
Log:
remove a couple warnings

Modified: branches/2.48/src/uimac14/cltool.c
===================================================================
--- branches/2.48/src/uimac14/cltool.c	2014-10-21 14:10:26 UTC (rev 534)
+++ branches/2.48/src/uimac14/cltool.c	2014-10-23 06:49:38 UTC (rev 535)
@@ -32,15 +32,15 @@
   if (status) {
     if (status == kLSApplicationNotFoundErr) {
       fprintf(stderr,"Error: can't find the Unison application using the Launch Services database.\n");
-      fprintf(stderr,"Try launching Unison from the Finder, and then try this again.\n",status);
+      fprintf(stderr,"Try launching Unison from the Finder, and then try this again.\n");
     }
-    else fprintf(stderr,"Error: can't find Unison application (%ld).\n",status);
+    else fprintf(stderr,"Error: can't find Unison application (%d).\n",(int)status);
     exit(1);
   }
 
   status = FSRefMakePath(&fsref,(UInt8 *)buf,BUFSIZE);
   if (status) {
-    fprintf(stderr,"Error: problem building path to Unison application (%ld).\n",status);
+    fprintf(stderr,"Error: problem building path to Unison application (%d).\n",(int)status);
     exit(1);
   }
 

Modified: branches/2.48/src/uimac14/uimacnew.xcodeproj/project.pbxproj
===================================================================
--- branches/2.48/src/uimac14/uimacnew.xcodeproj/project.pbxproj	2014-10-21 14:10:26 UTC (rev 534)
+++ branches/2.48/src/uimac14/uimacnew.xcodeproj/project.pbxproj	2014-10-23 06:49:38 UTC (rev 535)
@@ -83,7 +83,7 @@
 		B5B44C1F09DF61A4000DC7AF /* table-right-green.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1709DF61A4000DC7AF /* table-right-green.tif */; };
 		B5B44C2009DF61A4000DC7AF /* table-skip.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1809DF61A4000DC7AF /* table-skip.tif */; };
 		B5E03B3909E38B9E0058C7B9 /* rescan.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5E03B3809E38B9E0058C7B9 /* rescan.tif */; };
-		BB1ADE26114AEB1100575BFC /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BBE2BCAC11355CDD00B187F2 /* Growl.framework */; };
+		BB1ADE26114AEB1100575BFC /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BBE2BCAC11355CDD00B187F2 /* Growl.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		BBE2BCAE11355CDD00B187F2 /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBE2BCAC11355CDD00B187F2 /* Growl.framework */; };
 		DE2444D610C294EA007E1546 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = DE2444D410C294EA007E1546 /* MainMenu.xib */; };
 /* End PBXBuildFile section */
@@ -419,7 +419,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0410;
+				LastUpgradeCheck = 0610;
 			};
 			buildConfigurationList = 2A3C3F2C0992245300E404E9 /* Build configuration list for PBXProject "uimacnew" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -609,7 +609,7 @@
 		2A3C3F290992245300E404E9 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(FRAMEWORK_SEARCH_PATHS)",
@@ -651,7 +651,7 @@
 		2A3C3F2A0992245300E404E9 /* Deployment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(FRAMEWORK_SEARCH_PATHS)",
@@ -690,7 +690,7 @@
 		2A3C3F2B0992245300E404E9 /* Default */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(FRAMEWORK_SEARCH_PATHS)",
 					"$(SRCROOT)",