# HG changeset patch
# User koda
# Date 1288037940 -7200
# Node ID eb549fd864a5640a328b45a442e87f48622ccd14
# Parent 360332f8785ffcac1a5a5979fcc9750141a4a26f
the ios port is also iphone compatible
diff -r 360332f8785f -r eb549fd864a5 hedgewars/uTeams.pas
--- a/hedgewars/uTeams.pas Mon Oct 25 17:39:50 2010 +0200
+++ b/hedgewars/uTeams.pas Mon Oct 25 22:19:00 2010 +0200
@@ -270,7 +270,9 @@
ResetKbd;
cWindSpeed:= rndSign(GetRandom * 2 * cMaxWindSpeed);
-cWindSpeedf:= cWindSpeed.QWordValue / _1.QWordValue;
+// cWindSpeedf:= cWindSpeed.QWordValue / _1.QWordValue throws Internal error 200502052 on fpc 2.5.1
+// see http://mantis.freepascal.org/view.php?id=17714
+cWindSpeedf:= SignAs(cWindSpeed,cWindSpeed).QWordValue / SignAs(_1,_1).QWordValue;
if cWindSpeed.isNegative then
CWindSpeedf := -cWindSpeedf;
g:= AddGear(0, 0, gtATSmoothWindCh, 0, _0, _0, 1);
diff -r 360332f8785f -r eb549fd864a5 project_files/HedgewarsMobile/Classes/AmmoMenuViewController.m
--- a/project_files/HedgewarsMobile/Classes/AmmoMenuViewController.m Mon Oct 25 17:39:50 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/AmmoMenuViewController.m Mon Oct 25 22:19:00 2010 +0200
@@ -297,6 +297,8 @@
startingPoint = [[[allTouches allObjects] objectAtIndex:0] locationInView:self.view];
}
*/
+ if (IS_IPAD() == NO)
+ [self disappear];
}
-(void) touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
diff -r 360332f8785f -r eb549fd864a5 project_files/HedgewarsMobile/Classes/CGPointUtils.h
--- a/project_files/HedgewarsMobile/Classes/CGPointUtils.h Mon Oct 25 17:39:50 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/CGPointUtils.h Mon Oct 25 22:19:00 2010 +0200
@@ -12,9 +12,8 @@
#define degreesToRadians(x) ( M_PI * x / 180.0)
#define radiansToDegrees(x) (180.0 * x / M_PI )
-// 40 is not a good value for iphone but works for ipad
#define HWX(x) (int)(x-screen.size.height/2)/HW_zoomFactor()
-#define HWY(x) (int)(screen.size.width-x)/HW_zoomFactor() + 40*HW_zoomLevel()/HW_zoomFactor()
+#define HWY(x) (int)(screen.size.width-x)/HW_zoomFactor() + (IS_IPAD()?40:17.5)*HW_zoomLevel()/HW_zoomFactor()
#define HWXZ(x) (int)(x-screen.size.height/2)
#define HWYZ(x) (int)(screen.size.width-x)
diff -r 360332f8785f -r eb549fd864a5 project_files/HedgewarsMobile/Classes/CommodityFunctions.h
--- a/project_files/HedgewarsMobile/Classes/CommodityFunctions.h Mon Oct 25 17:39:50 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/CommodityFunctions.h Mon Oct 25 22:19:00 2010 +0200
@@ -53,6 +53,7 @@
#define UICOLOR_HW_ALPHABLUE [UIColor colorWithRed:(CGFloat)0x0F/255 green:0 blue:(CGFloat)0x42/255 alpha:0.58f]
#define IS_DUALHEAD() ([[UIScreen screens] count] > 1)
+#define IS_IPAD() (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
#define DEFAULT_NETGAME_PORT 46631
diff -r 360332f8785f -r eb549fd864a5 project_files/HedgewarsMobile/Classes/CommodityFunctions.m
--- a/project_files/HedgewarsMobile/Classes/CommodityFunctions.m Mon Oct 25 17:39:50 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/CommodityFunctions.m Mon Oct 25 22:19:00 2010 +0200
@@ -228,7 +228,7 @@
}
BOOL inline isApplePhone () {
- return (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone);
+ return (IS_IPAD() == NO);
}
NSString *modelType () {
diff -r 360332f8785f -r eb549fd864a5 project_files/HedgewarsMobile/Classes/GameConfigViewController.m
--- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Mon Oct 25 17:39:50 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Mon Oct 25 22:19:00 2010 +0200
@@ -40,7 +40,7 @@
-(IBAction) buttonPressed:(id) sender {
// works even if it's not actually a button
UIButton *theButton;
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
+ if (IS_IPAD())
theButton = [[(NSNotification *)sender userInfo] objectForKey:@"sender"];
else
theButton = (UIButton *)sender;
@@ -224,7 +224,7 @@
// present an alert to the user, with an image on the ipad (too big for the iphone)
NSString *msg = NSLocalizedString(@"Something went wrong with your configuration. Please try again.",@"");
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
+ if (IS_IPAD())
msg = [msg stringByAppendingString:@"\n\n\n\n\n\n\n\n"]; // this makes space for the image
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Whoops"
@@ -233,7 +233,7 @@
cancelButtonTitle:@"Ok"
otherButtonTitles:nil];
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+ if (IS_IPAD()) {
UIImageView *deniedImg = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:@"denied.png"]];
deniedImg.frame = CGRectMake(25, 80, 240, 160);
[alert addSubview:deniedImg];
@@ -285,7 +285,7 @@
CGRect screen = [[UIScreen mainScreen] bounds];
self.view.frame = CGRectMake(0, 0, screen.size.height, screen.size.width);
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+ if (IS_IPAD()) {
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(buttonPressed:)
name:@"buttonPressed"
@@ -346,7 +346,7 @@
}
-(void) viewWillAppear:(BOOL)animated {
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
+ if (IS_IPAD())
[NSThread detachNewThreadSelector:@selector(loadNiceHogs) toTarget:self withObject:nil];
[self.mapConfigViewController viewWillAppear:animated];
diff -r 360332f8785f -r eb549fd864a5 project_files/HedgewarsMobile/Classes/GameSetup.m
--- a/project_files/HedgewarsMobile/Classes/GameSetup.m Mon Oct 25 17:39:50 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/GameSetup.m Mon Oct 25 22:19:00 2010 +0200
@@ -478,7 +478,7 @@
tmpQuality = 0x00000002; // rqBlurryLand
else // = everything else
tmpQuality = 0; // full quality
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) // = disable tooltips on phone
+ if (IS_IPAD() == NO) // = disable tooltips on phone
tmpQuality = tmpQuality | 0x00000400;
// prevents using an empty nickname
diff -r 360332f8785f -r eb549fd864a5 project_files/HedgewarsMobile/Classes/InGameMenuViewController.m
--- a/project_files/HedgewarsMobile/Classes/InGameMenuViewController.m Mon Oct 25 17:39:50 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/InGameMenuViewController.m Mon Oct 25 22:19:00 2010 +0200
@@ -127,7 +127,7 @@
}
cell.textLabel.text = [menuList objectAtIndex:[indexPath row]];
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
+ if (IS_IPAD())
cell.textLabel.textAlignment = UITextAlignmentCenter;
return cell;
@@ -150,7 +150,7 @@
break;
case 2:
// expand the view (and table) so that the actionsheet can be selected on the iPhone
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
+ if (IS_IPAD()) {
CGRect screen = [[UIScreen mainScreen] bounds];
[self.tableView deselectRowAtIndexPath:indexPath animated:NO];
[UIView beginAnimations:@"table width more" context:NULL];
@@ -185,7 +185,7 @@
#pragma mark -
#pragma mark actionSheet methods
-(void) actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger) buttonIndex {
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone){
+ if (IS_IPAD()){
CGRect screen = [[UIScreen mainScreen] bounds];
[UIView beginAnimations:@"table width less" context:NULL];
[UIView setAnimationDuration:0.2];
diff -r 360332f8785f -r eb549fd864a5 project_files/HedgewarsMobile/Classes/MainMenuViewController.m
--- a/project_files/HedgewarsMobile/Classes/MainMenuViewController.m Mon Oct 25 17:39:50 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/MainMenuViewController.m Mon Oct 25 22:19:00 2010 +0200
@@ -158,7 +158,7 @@
switch (button.tag) {
case 0:
if (nil == self.gameConfigViewController) {
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
+ if (IS_IPAD())
xib = nil;
else
xib = @"GameConfigViewController";
diff -r 360332f8785f -r eb549fd864a5 project_files/HedgewarsMobile/Classes/MapConfigViewController.m
--- a/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Mon Oct 25 17:39:50 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Mon Oct 25 22:19:00 2010 +0200
@@ -126,7 +126,7 @@
if (cell == nil)
cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
+ if (IS_IPAD())
cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT;
if (self.dataSourceArray == nil)
@@ -135,6 +135,8 @@
NSString *labelString = [source objectAtIndex:row];
cell.textLabel.text = labelString;
+ cell.textLabel.adjustsFontSizeToFitWidth = YES;
+ cell.textLabel.minimumFontSize = 7;
if (isRandomness()) {
UIImage *image = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/%@/icon.png",THEMES_DIRECTORY(),labelString]];
@@ -350,7 +352,7 @@
self.missionCommand = mission;
// nice animation for updating the table when appropriate (on iphone)
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
+ if (IS_IPAD())
if (((oldPage == 0 || oldPage == 2) && (newPage == 1 || newPage == 3)) ||
((oldPage == 1 || oldPage == 3) && (newPage == 0 || newPage == 2)) ||
((oldPage == 1 && newPage == 3) || (oldPage == 3 || newPage == 1))) {
@@ -421,7 +423,7 @@
self.staticMapCommand = @"";
self.missionCommand = @"";
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+ if (IS_IPAD()) {
[self.tableView setBackgroundView:nil];
self.view.backgroundColor = [UIColor clearColor];
self.tableView.separatorColor = UICOLOR_HW_YELLOW_BODER;
diff -r 360332f8785f -r eb549fd864a5 project_files/HedgewarsMobile/Classes/MasterViewController.m
--- a/project_files/HedgewarsMobile/Classes/MasterViewController.m Mon Oct 25 17:39:50 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/MasterViewController.m Mon Oct 25 22:19:00 2010 +0200
@@ -52,7 +52,7 @@
[array release];
// targetControllers tells whether we're on the right or left side of the splitview -- on iphone we only use the right side
- if (targetController == nil && UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+ if (targetController == nil && IS_IPAD()) {
if (nil == generalSettingsViewController)
generalSettingsViewController = [[GeneralSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
generalSettingsViewController.navigationItem.hidesBackButton = YES;
diff -r 360332f8785f -r eb549fd864a5 project_files/HedgewarsMobile/Classes/OverlayViewController.m
--- a/project_files/HedgewarsMobile/Classes/OverlayViewController.m Mon Oct 25 17:39:50 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/OverlayViewController.m Mon Oct 25 22:19:00 2010 +0200
@@ -252,7 +252,7 @@
self.helpPage = nil;
if (self.amvc.view.superview == nil)
self.amvc = nil;
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
+ if (IS_IPAD())
if (((UIPopoverController *)self.popoverController).contentViewController.view.superview == nil)
self.popoverController = nil;
@@ -444,7 +444,7 @@
CGRect screen = [[UIScreen mainScreen] bounds];
isPopoverVisible = YES;
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+ if (IS_IPAD()) {
if (self.popupMenu == nil)
self.popupMenu = [[InGameMenuViewController alloc] initWithStyle:UITableViewStylePlain];
if (self.popoverController == nil) {
@@ -474,7 +474,7 @@
if (HW_isPaused())
HW_pause();
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+ if (IS_IPAD()) {
[(InGameMenuViewController *)[[self popoverController] contentViewController] removeChat];
[self.popoverController dismissPopoverAnimated:YES];
} else {
diff -r 360332f8785f -r eb549fd864a5 project_files/HedgewarsMobile/Classes/SDL_uikitappdelegate.m
--- a/project_files/HedgewarsMobile/Classes/SDL_uikitappdelegate.m Mon Oct 25 17:39:50 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/SDL_uikitappdelegate.m Mon Oct 25 22:19:00 2010 +0200
@@ -173,7 +173,7 @@
self.uiwindow = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
+ if (IS_IPAD())
self.mainViewController = [[MainMenuViewController alloc] initWithNibName:@"MainMenuViewController-iPad" bundle:nil];
else
self.mainViewController = [[MainMenuViewController alloc] initWithNibName:@"MainMenuViewController-iPhone" bundle:nil];
diff -r 360332f8785f -r eb549fd864a5 project_files/HedgewarsMobile/Classes/SavedGamesViewController.m
--- a/project_files/HedgewarsMobile/Classes/SavedGamesViewController.m Mon Oct 25 17:39:50 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/SavedGamesViewController.m Mon Oct 25 22:19:00 2010 +0200
@@ -85,7 +85,7 @@
-(IBAction) clearAll:(id) sender {
NSString *titleStr, *cancelStr, *confirmStr;
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+ if (IS_IPAD()) {
titleStr = nil;
cancelStr = nil;
confirmStr = NSLocalizedString(@"Tap to confirm",@"");
diff -r 360332f8785f -r eb549fd864a5 project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m
--- a/project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m Mon Oct 25 17:39:50 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m Mon Oct 25 22:19:00 2010 +0200
@@ -228,7 +228,7 @@
reuseIdentifier:CellIdentifier1] autorelease];
int offset = 0;
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
+ if (IS_IPAD())
offset = 50;
UISlider *slider = [[UISlider alloc] initWithFrame:CGRectMake(offset+260, 12, offset+150, 23)];
diff -r 360332f8785f -r eb549fd864a5 project_files/HedgewarsMobile/Classes/SplitViewRootController.m
--- a/project_files/HedgewarsMobile/Classes/SplitViewRootController.m Mon Oct 25 17:39:50 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/SplitViewRootController.m Mon Oct 25 22:19:00 2010 +0200
@@ -51,7 +51,7 @@
}
UINavigationController *rightNavController = [[UINavigationController alloc] initWithRootViewController:self.activeController];
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+ if (IS_IPAD()) {
MasterViewController *leftController = [[MasterViewController alloc] initWithStyle:UITableViewStylePlain];
leftController.targetController = self.activeController;
UINavigationController *leftNavController = [[UINavigationController alloc] initWithRootViewController:leftController];
diff -r 360332f8785f -r eb549fd864a5 project_files/HedgewarsMobile/Classes/WeaponCellView.m
--- a/project_files/HedgewarsMobile/Classes/WeaponCellView.m Mon Oct 25 17:39:50 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/WeaponCellView.m Mon Oct 25 22:19:00 2010 +0200
@@ -133,7 +133,7 @@
CGFloat shiftSliders = contentRect.origin.x;
CGFloat shiftLabel = 0;
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+ if (IS_IPAD()) {
shiftSliders += 65;
shiftLabel += 165;
} else
diff -r 360332f8785f -r eb549fd864a5 project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj
--- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Mon Oct 25 17:39:50 2010 +0200
+++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Mon Oct 25 22:19:00 2010 +0200
@@ -141,6 +141,14 @@
619C5BA2124FA59000D041AE /* MapPreviewButtonView.m in Sources */ = {isa = PBXBuildFile; fileRef = 619C5BA1124FA59000D041AE /* MapPreviewButtonView.m */; };
61A1188511683A8C00359010 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61A117FE1168322700359010 /* CoreGraphics.framework */; settings = {ATTRIBUTES = (Required, ); }; };
61A118D311683CD100359010 /* HedgewarsTitle.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FD9CB1155A28C00C2203D /* HedgewarsTitle.png */; };
+ 61A670BE12747D8900B06CE7 /* borderBottom.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903E911DF58550068B24D /* borderBottom.png */; };
+ 61A670BF12747D9100B06CE7 /* borderTop.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903EA11DF58550068B24D /* borderTop.png */; };
+ 61A670C012747D9B00B06CE7 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 6183D83D11E2BCE200A88903 /* Default.png */; };
+ 61A670C112747DB900B06CE7 /* MainMenuViewController-iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924C11CA9CB400D6E256 /* MainMenuViewController-iPhone.xib */; };
+ 61A670C212747DBD00B06CE7 /* MapConfigViewController-iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924E11CA9CB400D6E256 /* MapConfigViewController-iPhone.xib */; };
+ 61A670FA12747E0000B06CE7 /* playButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903EC11DF58550068B24D /* playButton.png */; };
+ 61A670FB12747E0D00B06CE7 /* title_small.png in Resources */ = {isa = PBXBuildFile; fileRef = 619C09E911E8B8D600F1DF16 /* title_small.png */; };
+ 61A6710612747E4000B06CE7 /* backgroundCenter.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903E511DF58550068B24D /* backgroundCenter.png */; };
61B3D71C11EA6F2700EC7420 /* uKeys.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; };
61C079E411F35A300072BF46 /* EditableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 61C079E311F35A300072BF46 /* EditableCellView.m */; };
61DE8F221257EB1100B80214 /* AmmoMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61DE8F211257EB1100B80214 /* AmmoMenuViewController.m */; };
@@ -1499,7 +1507,14 @@
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Hedgewars" */;
compatibilityVersion = "Xcode 3.1";
+ developmentRegion = English;
hasScannedForEncodings = 1;
+ knownRegions = (
+ English,
+ Japanese,
+ French,
+ German,
+ );
mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
projectDirPath = "";
projectReferences = (
@@ -2126,6 +2141,14 @@
6147DAD31253DCDE0010357E /* savesButton.png in Resources */,
610D5FB21270E2660033333A /* Icon-Small@2x.png in Resources */,
610D5FB31270E26C0033333A /* Icon@2x.png in Resources */,
+ 61A670BE12747D8900B06CE7 /* borderBottom.png in Resources */,
+ 61A670BF12747D9100B06CE7 /* borderTop.png in Resources */,
+ 61A670C012747D9B00B06CE7 /* Default.png in Resources */,
+ 61A670C112747DB900B06CE7 /* MainMenuViewController-iPhone.xib in Resources */,
+ 61A670C212747DBD00B06CE7 /* MapConfigViewController-iPhone.xib in Resources */,
+ 61A670FA12747E0000B06CE7 /* playButton.png in Resources */,
+ 61A670FB12747E0D00B06CE7 /* title_small.png in Resources */,
+ 61A6710612747E4000B06CE7 /* backgroundCenter.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2323,7 +2346,8 @@
61022D7C12305A2800B08935 /* DistributionAppStore */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+ APPLY_RULES_IN_COPY_FILES = YES;
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CODE_SIGN_IDENTITY = "iPhone Distribution: Vittorio Giovara";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Vittorio Giovara";
FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix -Sc";
@@ -2350,7 +2374,7 @@
"\"$(SRCROOT)/../../../Library/SDL-1.3/SDL_mixer/\"",
);
IPHONEOS_DEPLOYMENT_TARGET = 3.2;
- ONLY_ACTIVE_ARCH = YES;
+ ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = (
"-lz",
"-Wl,-no_order_inits",
@@ -2358,10 +2382,10 @@
PREBINDING = NO;
PROVISIONING_PROFILE = "450C4020-346A-4F44-8DDE-E71300796C94";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "450C4020-346A-4F44-8DDE-E71300796C94";
- SDKROOT = iphoneos4.0;
- TARGETED_DEVICE_FAMILY = 2;
+ SDKROOT = iphoneos4.1;
+ TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
- VALID_ARCHS = "armv7 armv6";
+ VALID_ARCHS = "armv6 armv7";
};
name = DistributionAppStore;
};
@@ -2415,7 +2439,8 @@
6137064B117B1CB3004EE44A /* DistributionAdHoc */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+ APPLY_RULES_IN_COPY_FILES = YES;
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CODE_SIGN_ENTITLEMENTS = "Entitlements-Distribution.plist";
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
@@ -2443,7 +2468,7 @@
"\"$(SRCROOT)/../../../Library/SDL-1.3/SDL_mixer/\"",
);
IPHONEOS_DEPLOYMENT_TARGET = 3.2;
- ONLY_ACTIVE_ARCH = YES;
+ ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = (
"-lz",
"-Wl,-no_order_inits",
@@ -2451,10 +2476,10 @@
PREBINDING = NO;
PROVISIONING_PROFILE = "";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
- SDKROOT = iphoneos4.0;
- TARGETED_DEVICE_FAMILY = 2;
+ SDKROOT = iphoneos4.1;
+ TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
- VALID_ARCHS = "armv7 armv6";
+ VALID_ARCHS = "armv6 armv7";
};
name = DistributionAdHoc;
};
@@ -2506,7 +2531,8 @@
6164429D11B5CDE500B9A6F3 /* Valgrind */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+ APPLY_RULES_IN_COPY_FILES = YES;
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CODE_SIGN_IDENTITY = "iPhone Developer: Vittorio Giovara (DC2BRETXAC)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Vittorio Giovara (DC2BRETXAC)";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -2537,16 +2563,16 @@
"\"$(SRCROOT)/../../../Library/SDL-1.3/SDL_mixer/\"",
);
IPHONEOS_DEPLOYMENT_TARGET = 3.2;
- ONLY_ACTIVE_ARCH = YES;
+ ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = (
"-lz",
"-Wl,-no_order_inits",
);
PREBINDING = NO;
- SDKROOT = iphoneos4.0;
- TARGETED_DEVICE_FAMILY = 2;
+ SDKROOT = iphoneos4.1;
+ TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = NO;
- VALID_ARCHS = "armv7 armv6";
+ VALID_ARCHS = "armv6 armv7";
};
name = Valgrind;
};
@@ -2641,7 +2667,8 @@
C01FCF4F08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+ APPLY_RULES_IN_COPY_FILES = YES;
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CODE_SIGN_IDENTITY = "iPhone Developer: Vittorio Giovara (DC2BRETXAC)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Vittorio Giovara (DC2BRETXAC)";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -2658,7 +2685,7 @@
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
GCC_STRICT_ALIASING = YES;
GCC_THUMB_SUPPORT = NO;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
@@ -2669,23 +2696,24 @@
"\"$(SRCROOT)/../../../Library/SDL-1.3/SDL_mixer/\"",
);
IPHONEOS_DEPLOYMENT_TARGET = 3.2;
- ONLY_ACTIVE_ARCH = YES;
+ ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = (
"-lz",
"-Wl,-no_order_inits",
);
PREBINDING = NO;
- SDKROOT = iphoneos4.0;
- TARGETED_DEVICE_FAMILY = 2;
+ SDKROOT = iphoneos4.1;
+ TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = NO;
- VALID_ARCHS = "armv7 armv6";
+ VALID_ARCHS = "armv6 armv7";
};
name = Debug;
};
C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+ APPLY_RULES_IN_COPY_FILES = YES;
+ 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 -Sc";
@@ -2712,7 +2740,7 @@
"\"$(SRCROOT)/../../../Library/SDL-1.3/SDL_mixer/\"",
);
IPHONEOS_DEPLOYMENT_TARGET = 3.2;
- ONLY_ACTIVE_ARCH = YES;
+ ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = (
"-lz",
"-Wl,-no_order_inits",
@@ -2720,10 +2748,10 @@
PREBINDING = NO;
PROVISIONING_PROFILE = "";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
- SDKROOT = iphoneos4.0;
- TARGETED_DEVICE_FAMILY = 2;
+ SDKROOT = iphoneos4.1;
+ TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = NO;
- VALID_ARCHS = "armv7 armv6";
+ VALID_ARCHS = "armv6 armv7";
};
name = Release;
};
diff -r 360332f8785f -r eb549fd864a5 project_files/HedgewarsMobile/Resources/MainMenuViewController-iPhone.xib
--- a/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPhone.xib Mon Oct 25 17:39:50 2010 +0200
+++ b/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPhone.xib Mon Oct 25 22:19:00 2010 +0200
@@ -3,16 +3,16 @@
1024
10F569
- 788
+ 804
1038.29
461.00
- 42
+ 44
-
-
-
- 117
+ 123
diff -r 360332f8785f -r eb549fd864a5 project_files/HedgewarsMobile/Resources/MapConfigViewController-iPhone.xib
--- a/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPhone.xib Mon Oct 25 17:39:50 2010 +0200
+++ b/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPhone.xib Mon Oct 25 22:19:00 2010 +0200
@@ -3,12 +3,12 @@
1024
10F569
- 788
+ 804
1038.29
461.00