Changes to build universal binary and support 10.5, ppc

jils · Apr 7, 2012 · 4f49791 · 4f49791
1 parent 7633587
commit 4f49791
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 21 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,10 @@
 build
-DerivedData
+DerivedData
+.DS_Store
+FlashbackChecker.xcodeproj/jils.pbxuser
+
+FlashbackChecker.xcodeproj/jils.perspectivev3
+
+FlashbackChecker.xcodeproj/project.xcworkspace/xcuserdata/jils.xcuserdatad/UserInterfaceState.xcuserstate
+
+FlashbackChecker.xcodeproj/xcuserdata/jils.xcuserdatad/xcschemes/FlashBackChecker.xcscheme
diff --git a/FlashbackChecker.xcodeproj/project.pbxproj b/FlashbackChecker.xcodeproj/project.pbxproj
@@ -185,7 +185,11 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				ARCHS = (
+					ppc,
+					x86_64,
+					i386,
+				);
 				COPY_PHASE_STRIP = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -196,22 +200,27 @@
 					"$(inherited)",
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_VERSION = 4.2;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = macosx;
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				ONLY_ACTIVE_ARCH = NO;
+				SDKROOT = macosx10.6;
+				VALID_ARCHS = "i386 x86_64 ppc";
 			};
 			name = Debug;
 		};
 		2DD881EF152E968100121E1E /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				ARCHS = (
+					ppc,
+					x86_64,
+					i386,
+				);
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -221,8 +230,9 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
-				SDKROOT = macosx;
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				SDKROOT = macosx10.5;
+				VALID_ARCHS = "i386 x86_64 ppc";
 			};
 			name = Release;
 		};

diff --git a/FlashbackChecker/AppDelegate.h b/FlashbackChecker/AppDelegate.h
@@ -8,10 +8,11 @@
 
 #import <Cocoa/Cocoa.h>
 
-@interface AppDelegate : NSObject <NSApplicationDelegate>
-
-@property (assign) IBOutlet NSWindow* window;
-@property (assign) IBOutlet NSTextView* textView;
+@interface AppDelegate : NSObject //<NSApplicationDelegate>
+{
+    IBOutlet NSWindow* window;
+    IBOutlet NSTextView* textView;
+}
 
 - (IBAction)checkForInfection:(id)aSender;
 

diff --git a/FlashbackChecker/AppDelegate.m b/FlashbackChecker/AppDelegate.m
@@ -17,9 +17,6 @@ - (void)log:(NSString*)aString;
 
 @implementation AppDelegate
 
-@synthesize window = _window;
-@synthesize textView = _textView;
-
 - (void)dealloc
 {
     [super dealloc];
@@ -32,7 +29,7 @@ - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theAppl
 
 - (IBAction)checkForInfection:(id)aSender
 {
-    [self.textView setString:@""];
+    [textView setString:@""];
 
 
     NSString* theSafari = @"/Applications/Safari.app/Contents/Info.plist";
@@ -52,7 +49,7 @@ - (IBAction)checkForInfection:(id)aSender
         id theObject = [self valueForKey:theKey atPath:theFile];
         if( theObject )
         {
-            [self log:[NSString stringWithFormat:@"Potential Infection found at: %@", theFile]];
+            [self log:[NSString stringWithFormat:@"Potential Issue found at: %@", theFile]];
             [self log:[theObject description]];
             theInfected = YES;
         }
@@ -72,7 +69,7 @@ - (IBAction)checkForInfection:(id)aSender
 
     if( !theInfected )
     {
-        [self log:@"\nNo Signs of infection were found."];
+        [self log:@"No Signs of infection were found."];
     }
 
     NSString* theVisit = @"\n\nVisit the F-Secure site for more information:\nhttp://www.f-secure.com/v-descs/trojan-downloader_osx_flashback_i.shtml";
@@ -102,8 +99,8 @@ - (id)valueForKey:(NSString*)aKey atPath:(NSString*)aPath
 
 - (void)log:(NSString*)aString
 {
-    NSString* theString = [self.textView string];
-    [self.textView setString:[NSString stringWithFormat:@"%@%@\n", theString, aString]];
+    NSString* theString = [textView string];
+    [textView setString:[NSString stringWithFormat:@"%@%@\n", theString, aString]];
 }