--- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Wed Jun 30 22:20:52 2010 +0200
+++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Wed Jun 30 22:42:55 2010 +0200
@@ -30,6 +30,9 @@
6122CD01116BECCA002648E9 /* Default-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 6122CD00116BECCA002648E9 /* Default-Landscape.png */; };
61272334117DF764005B90CF /* libSDL_image.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61272333117DF752005B90CF /* libSDL_image.a */; };
61272339117DF778005B90CF /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61272338117DF778005B90CF /* MobileCoreServices.framework */; };
+ 6132878111D9517D006BA39D /* joyButton_backjump.png in Resources */ = {isa = PBXBuildFile; fileRef = 6132878011D9517D006BA39D /* joyButton_backjump.png */; };
+ 6132878311D95185006BA39D /* joyButton_forwardjump.png in Resources */ = {isa = PBXBuildFile; fileRef = 6132878211D95185006BA39D /* joyButton_forwardjump.png */; };
+ 6132878511D9518B006BA39D /* joyButton_attack.png in Resources */ = {isa = PBXBuildFile; fileRef = 6132878411D9518B006BA39D /* joyButton_attack.png */; };
61370653117B1D50004EE44A /* Entitlements-Distribution.plist in Resources */ = {isa = PBXBuildFile; fileRef = 61370652117B1D50004EE44A /* Entitlements-Distribution.plist */; };
6151347E116C2803001F16D1 /* Icon-iPad.png in Resources */ = {isa = PBXBuildFile; fileRef = 6151347D116C2803001F16D1 /* Icon-iPad.png */; };
61536CCF11CE836E00D87A7E /* libfreetype_x86.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798917114AAF2100BA94A9 /* libfreetype_x86.a */; };
@@ -200,6 +203,13 @@
remoteGlobalIDString = BE48FD6E07AFA17000BB41DA;
remoteInfo = "Static Library";
};
+ 6184608B11DA8BF3000E1314 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 617988D3114AAA3900BA94A9 /* SDLiPhoneOS.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 006E982211955059001DE610;
+ remoteInfo = testsdl;
+ };
61C325201179A30E001E70B1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
@@ -232,6 +242,9 @@
6122CD00116BECCA002648E9 /* Default-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape.png"; path = "Resources/Default-Landscape.png"; sourceTree = "<group>"; };
6127232E117DF752005B90CF /* SDL_image.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_image.xcodeproj; path = "../../../Library/SDL-1.3/SDL_image/Xcode_iPhone/SDL_image.xcodeproj"; sourceTree = SOURCE_ROOT; };
61272338117DF778005B90CF /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
+ 6132878011D9517D006BA39D /* joyButton_backjump.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyButton_backjump.png; path = Resources/joyButton_backjump.png; sourceTree = "<group>"; };
+ 6132878211D95185006BA39D /* joyButton_forwardjump.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyButton_forwardjump.png; path = Resources/joyButton_forwardjump.png; sourceTree = "<group>"; };
+ 6132878411D9518B006BA39D /* joyButton_attack.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyButton_attack.png; path = Resources/joyButton_attack.png; sourceTree = "<group>"; };
61370652117B1D50004EE44A /* Entitlements-Distribution.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Entitlements-Distribution.plist"; sourceTree = "<group>"; };
6151347D116C2803001F16D1 /* Icon-iPad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-iPad.png"; path = "Resources/Icon-iPad.png"; sourceTree = "<group>"; };
6163EE7C11CC2600001C0453 /* SingleWeaponViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SingleWeaponViewController.h; sourceTree = "<group>"; };
@@ -432,6 +445,8 @@
6163EE6C11CC253F001C0453 /* Overlay */,
616591F011CA9BA200D6E256 /* MainMenuViewController.h */,
616591F111CA9BA200D6E256 /* MainMenuViewController.m */,
+ 6165924B11CA9CB400D6E256 /* MainMenuViewController-iPad.xib */,
+ 6165924C11CA9CB400D6E256 /* MainMenuViewController-iPhone.xib */,
616591E611CA9BA200D6E256 /* GameSetup.h */,
616591E711CA9BA200D6E256 /* GameSetup.m */,
);
@@ -489,7 +504,6 @@
isa = PBXGroup;
children = (
6100DAD4115446B000F455E0 /* Resources-iPad */,
- 6100DB1711544E8400F455E0 /* XIB */,
6179937011501D5800BA94A9 /* buttons */,
6179936F11501D4100BA94A9 /* back panels */,
6179936611501D1E00BA94A9 /* joystick */,
@@ -539,20 +553,6 @@
name = "Resources-iPad";
sourceTree = "<group>";
};
- 6100DB1711544E8400F455E0 /* XIB */ = {
- isa = PBXGroup;
- children = (
- 6165924A11CA9CB400D6E256 /* GameConfigViewController.xib */,
- 6165924B11CA9CB400D6E256 /* MainMenuViewController-iPad.xib */,
- 6165924C11CA9CB400D6E256 /* MainMenuViewController-iPhone.xib */,
- 6165924D11CA9CB400D6E256 /* MapConfigViewController-iPad.xib */,
- 6165924E11CA9CB400D6E256 /* MapConfigViewController-iPhone.xib */,
- 6165925011CA9CB400D6E256 /* OverlayViewController.xib */,
- );
- name = XIB;
- path = Classes;
- sourceTree = "<group>";
- };
6127232F117DF752005B90CF /* Products */ = {
isa = PBXGroup;
children = (
@@ -582,12 +582,15 @@
children = (
616591E411CA9BA200D6E256 /* GameConfigViewController.h */,
616591E511CA9BA200D6E256 /* GameConfigViewController.m */,
+ 6165924A11CA9CB400D6E256 /* GameConfigViewController.xib */,
6165920411CA9BA200D6E256 /* TeamConfigViewController.h */,
6165920511CA9BA200D6E256 /* TeamConfigViewController.m */,
616591FC11CA9BA200D6E256 /* SchemeWeaponConfigViewController.h */,
616591FD11CA9BA200D6E256 /* SchemeWeaponConfigViewController.m */,
616591F211CA9BA200D6E256 /* MapConfigViewController.h */,
616591F311CA9BA200D6E256 /* MapConfigViewController.m */,
+ 6165924D11CA9CB400D6E256 /* MapConfigViewController-iPad.xib */,
+ 6165924E11CA9CB400D6E256 /* MapConfigViewController-iPhone.xib */,
);
name = "Game Config";
sourceTree = "<group>";
@@ -646,6 +649,7 @@
616591F911CA9BA200D6E256 /* PopoverMenuViewController.m */,
616591F611CA9BA200D6E256 /* OverlayViewController.h */,
616591F711CA9BA200D6E256 /* OverlayViewController.m */,
+ 6165925011CA9CB400D6E256 /* OverlayViewController.xib */,
);
name = Overlay;
sourceTree = "<group>";
@@ -685,6 +689,7 @@
isa = PBXGroup;
children = (
617988DA114AAA3900BA94A9 /* libSDLiPhoneOS.a */,
+ 6184608C11DA8BF3000E1314 /* testsdl.app */,
);
name = Products;
sourceTree = "<group>";
@@ -721,6 +726,9 @@
6165925B11CA9CD300D6E256 /* arrowRight.png */,
6165925C11CA9CD300D6E256 /* arrowUp.png */,
6165925D11CA9CD300D6E256 /* joyPush.png */,
+ 6132878011D9517D006BA39D /* joyButton_backjump.png */,
+ 6132878211D95185006BA39D /* joyButton_forwardjump.png */,
+ 6132878411D9518B006BA39D /* joyButton_attack.png */,
);
name = joystick;
sourceTree = "<group>";
@@ -945,6 +953,13 @@
remoteRef = 61798A12114AB65600BA94A9 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
+ 6184608C11DA8BF3000E1314 /* testsdl.app */ = {
+ isa = PBXReferenceProxy;
+ fileType = wrapper.application;
+ path = testsdl.app;
+ remoteRef = 6184608B11DA8BF3000E1314 /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */
@@ -987,6 +1002,9 @@
6165928811CA9D4800D6E256 /* playButton.png in Resources */,
6165928911CA9D4800D6E256 /* settingsButton.png in Resources */,
6165928A11CA9D4800D6E256 /* storeButton.png in Resources */,
+ 6132878111D9517D006BA39D /* joyButton_backjump.png in Resources */,
+ 6132878311D95185006BA39D /* joyButton_forwardjump.png in Resources */,
+ 6132878511D9518B006BA39D /* joyButton_attack.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1191,7 +1209,7 @@
CODE_SIGN_ENTITLEMENTS = "Entitlements-Distribution.plist";
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
- FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix";
+ FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix -Sc";
FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.5.1;
FPC_MAIN_FILE = "$(PROJECT_DIR)/../../hedgewars/hwLibrary.pas";
FPC_RTL_UNITS_BASE = /usr/local/lib/fpc;
@@ -1302,7 +1320,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer: Vittorio Giovara (DC2BRETXAC)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Vittorio Giovara (DC2BRETXAC)";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix";
+ FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix -Sc";
FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.5.1;
FPC_MAIN_FILE = "$(PROJECT_DIR)/../../hedgewars/hwLibrary.pas";
FPC_RTL_UNITS_BASE = /usr/local/lib/fpc;
@@ -1505,7 +1523,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer: Vittorio Giovara (DC2BRETXAC)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Vittorio Giovara (DC2BRETXAC)";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix";
+ FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix -Sc";
FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.5.1;
FPC_MAIN_FILE = "$(PROJECT_DIR)/../../hedgewars/hwLibrary.pas";
FPC_RTL_UNITS_BASE = /usr/local/lib/fpc;
@@ -1544,7 +1562,7 @@
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix";
+ FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix -Sc";
FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.5.1;
FPC_MAIN_FILE = "$(PROJECT_DIR)/../../hedgewars/hwLibrary.pas";
FPC_RTL_UNITS_BASE = /usr/local/lib/fpc;