# HG changeset patch # User Eric Wing # Date 1311989815 25200 # Node ID 143ac8f6fe3518a06ed2981795e4167869f940ec # Parent 5ec52341f221fef50c979c821d6e8ca98fb5da58 Made universal iPhone/iPad diff -r 5ec52341f221 -r 143ac8f6fe35 MySampleProject-Info.plist --- a/MySampleProject-Info.plist Fri Jul 29 18:18:15 2011 -0700 +++ b/MySampleProject-Info.plist Fri Jul 29 18:36:55 2011 -0700 @@ -26,6 +26,8 @@ NSMainNibFile MainWindow + NSMainNibFile~ipad + MainWindow-iPad UIStatusBarHidden diff -r 5ec52341f221 -r 143ac8f6fe35 MySampleProject.xcodeproj/project.pbxproj --- a/MySampleProject.xcodeproj/project.pbxproj Fri Jul 29 18:18:15 2011 -0700 +++ b/MySampleProject.xcodeproj/project.pbxproj Fri Jul 29 18:36:55 2011 -0700 @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 003E2B1413E3970500A286C6 /* MainWindow-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 003E2B1313E3970500A286C6 /* MainWindow-iPad.xib */; }; 00841E4E13E3929C00091BB8 /* Shader.fsh in Resources */ = {isa = PBXBuildFile; fileRef = 2514C27910084DCA00A42282 /* Shader.fsh */; }; 00841E4F13E3929C00091BB8 /* Shader.vsh in Resources */ = {isa = PBXBuildFile; fileRef = 2514C27A10084DCA00A42282 /* Shader.vsh */; }; 00841E5013E3929C00091BB8 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD733E0D9D9553002E5188 /* MainWindow.xib */; }; @@ -34,6 +35,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 003E2B1313E3970500A286C6 /* MainWindow-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MainWindow-iPad.xib"; path = "Resources-iPad/MainWindow-iPad.xib"; sourceTree = ""; }; 00841E5F13E3929C00091BB8 /* OpenGLES2.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OpenGLES2.app; sourceTree = BUILT_PRODUCTS_DIR; }; 00841E6113E3929C00091BB8 /* MySampleProject-Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "MySampleProject-Info copy.plist"; sourceTree = ""; }; 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -82,6 +84,14 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 003E2B1013E3970500A286C6 /* Resources-iPad */ = { + isa = PBXGroup; + children = ( + 003E2B1313E3970500A286C6 /* MainWindow-iPad.xib */, + ); + name = "Resources-iPad"; + sourceTree = ""; + }; 080E96DDFE201D6D7F000001 /* Classes */ = { isa = PBXGroup; children = ( @@ -120,6 +130,7 @@ 2514C27610084DB600A42282 /* Shaders */, 29B97315FDCFA39411CA2CEA /* Other Sources */, 29B97317FDCFA39411CA2CEA /* Resources */, + 003E2B1013E3970500A286C6 /* Resources-iPad */, 29B97323FDCFA39411CA2CEA /* Frameworks */, 19C28FACFE9D520D11CA2CBB /* Products */, ); @@ -239,6 +250,7 @@ 2514C27C10084DCA00A42282 /* Shader.vsh in Resources */, 28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */, 28EC4C5A11D54ECE0027AA9F /* MySampleProjectViewController.xib in Resources */, + 003E2B1413E3970500A286C6 /* MainWindow-iPad.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -306,6 +318,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -313,6 +326,7 @@ GCC_PREFIX_HEADER = MySampleProject_Prefix.pch; INFOPLIST_FILE = "MySampleProject-Info.plist"; PRODUCT_NAME = OpenGLES1; + SDKROOT = iphoneos; }; name = Debug; }; @@ -320,11 +334,13 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = MySampleProject_Prefix.pch; INFOPLIST_FILE = "MySampleProject-Info.plist"; PRODUCT_NAME = OpenGLES1; + SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; }; name = Release; @@ -340,6 +356,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -354,6 +371,7 @@ OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PREBINDING = NO; SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; diff -r 5ec52341f221 -r 143ac8f6fe35 Resources-iPad/MainWindow-iPad.xib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Resources-iPad/MainWindow-iPad.xib Fri Jul 29 18:36:55 2011 -0700 @@ -0,0 +1,485 @@ + + + + 1056 + 10K549 + 851 + 1038.36 + 461.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 141 + + + YES + + + YES + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + YES + + YES + + + YES + + + + YES + + IBFilesOwner + IBIPadFramework + + + IBFirstResponder + IBIPadFramework + + + IBIPadFramework + + + MySampleProjectViewController + + 1 + + YES + IBIPadFramework + NO + + + + 1316 + + {320, 480} + + 1 + MSAxIDEAA + + NO + IBIPadFramework + YES + YES + + + + + YES + + + delegate + + + + 4 + + + + window + + + + 5 + + + + viewController + + + + 12 + + + + + YES + + 0 + + + + + + 2 + + + YES + + + + + -1 + + + File's Owner + + + 3 + + + + + -2 + + + + + 10 + + + + + + + YES + + YES + -1.CustomClassName + -2.CustomClassName + 10.CustomClassName + 10.IBEditorWindowLastContentRect + 10.IBPluginDependency + 2.IBAttributePlaceholdersKey + 2.IBEditorWindowLastContentRect + 2.IBPluginDependency + 3.CustomClassName + 3.IBPluginDependency + + + YES + UIApplication + UIResponder + MySampleProjectViewController + {{415, 586}, {320, 480}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + YES + + + YES + + + {{400, 376}, {320, 480}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + MySampleProjectAppDelegate + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + YES + + + YES + + + + + YES + + + YES + + + + 12 + + + + YES + + MySampleProjectAppDelegate + NSObject + + YES + + YES + viewController + window + + + YES + MySampleProjectViewController + UIWindow + + + + YES + + YES + viewController + window + + + YES + + viewController + MySampleProjectViewController + + + window + UIWindow + + + + + IBProjectSource + Classes/MySampleProjectAppDelegate.h + + + + MySampleProjectAppDelegate + NSObject + + IBUserSource + + + + + MySampleProjectViewController + UIViewController + + displayLink + id + + + displayLink + + displayLink + id + + + + IBProjectSource + Classes/MySampleProjectViewController.h + + + + MySampleProjectViewController + UIViewController + + IBUserSource + + + + + + YES + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSError.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFileManager.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueObserving.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyedArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObject.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSRunLoop.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSThread.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURL.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLConnection.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CAAnimation.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CALayer.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIAccessibility.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UINibLoading.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIResponder.h + + + + UIApplication + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIApplication.h + + + + UIResponder + NSObject + + + + UISearchBar + UIView + + IBFrameworkSource + UIKit.framework/Headers/UISearchBar.h + + + + UISearchDisplayController + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UISearchDisplayController.h + + + + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIPrintFormatter.h + + + + UIView + + IBFrameworkSource + UIKit.framework/Headers/UITextField.h + + + + UIView + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIView.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UINavigationController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UIPopoverController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UISplitViewController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UITabBarController.h + + + + UIViewController + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIViewController.h + + + + UIWindow + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIWindow.h + + + + + 0 + IBIPadFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + + YES + MySampleProject.xcodeproj + 3 + 141 + +