unbreak build (everyone saw this coming)
authorkoda
Sun, 16 May 2010 18:12:10 +0000
changeset 3464 cdb0ddeb38ba
parent 3463 23c50be687a9
child 3465 b290993c0810
unbreak build (everyone saw this coming)
cocoaTouch/MainMenuViewController.m
cocoaTouch/SplitViewRootController.m
hedgewars/hwLibrary.pas
hedgewars/uMisc.pas
hedgewars/uWorld.pas
project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj
--- a/cocoaTouch/MainMenuViewController.m	Sun May 16 17:23:30 2010 +0000
+++ b/cocoaTouch/MainMenuViewController.m	Sun May 16 18:12:10 2010 +0000
@@ -111,12 +111,15 @@
             [self presentModalViewController:gameConfigViewController animated:YES];
             break;
         case 2:
+            /*
             if (nil == splitRootViewController) {
                 splitRootViewController = [[SplitViewRootController alloc] initWithNibName:nil bundle:nil];
                 splitRootViewController.modalTransitionStyle = UIModalTransitionStyleFlipHorizontal;
             }
             
+            [self.view addSubview:splitRootViewController.view];
             [self presentModalViewController:splitRootViewController animated:YES];
+            */
             break;
         case 3:
             debugStr = [[NSString alloc] initWithContentsOfFile:DEBUG_FILE()];
--- a/cocoaTouch/SplitViewRootController.m	Sun May 16 17:23:30 2010 +0000
+++ b/cocoaTouch/SplitViewRootController.m	Sun May 16 18:12:10 2010 +0000
@@ -46,9 +46,7 @@
         
         UINavigationController *mainNavController = [[UINavigationController alloc] initWithRootViewController:masterViewController];
     
-        masterViewController.detailViewController = detailViewController;
-        //[splitViewRootController setDelegate:detailViewController];
-        
+        masterViewController.detailViewController = detailViewController;        
         [masterViewController release];
 
         [splitViewRootController setViewControllers:[NSArray arrayWithObjects: mainNavController, detailedNavController, nil]];
--- a/hedgewars/hwLibrary.pas	Sun May 16 17:23:30 2010 +0000
+++ b/hedgewars/hwLibrary.pas	Sun May 16 18:12:10 2010 +0000
@@ -12,7 +12,7 @@
 // these procedures/functions to the PascalImports.h file (also in the "Pascal Sources" group)
 // to make these functions available in the C/C++/Objective-C source files
 // (add "#include PascalImports.h" near the top of these files if it's not there yet)
-uses cmem, hwengine;
+uses cmem, hwengine, PascalExports;
 
 end.
 
--- a/hedgewars/uMisc.pas	Sun May 16 17:23:30 2010 +0000
+++ b/hedgewars/uMisc.pas	Sun May 16 18:12:10 2010 +0000
@@ -170,7 +170,7 @@
 {$ENDIF}
 
 implementation
-uses Math, uConsole, uStore, uIO, typinfo;
+uses Math, uConsole, uStore, uIO, uSound, typinfo;
 
 var KBnum: Longword;
 {$IFDEF DEBUGFILE}
--- a/hedgewars/uWorld.pas	Sun May 16 17:23:30 2010 +0000
+++ b/hedgewars/uWorld.pas	Sun May 16 18:12:10 2010 +0000
@@ -169,7 +169,7 @@
 AMSlotSize:= 33;
 {$IFDEF IPHONEOS}
 AMxOffset:= 10;
-AMyOffset:= 10;
+AMyOffset:= 10 + 123;   // moved downwards
 AMWidth:= (cMaxSlotAmmoIndex + 1) * AMSlotSize + AMxOffset;
 {$ELSE}
 AMxOffset:= 10;
@@ -235,7 +235,7 @@
 {$IFDEF IPHONEOS}
 Slot:= cMaxSlotIndex;
 x:= x - cOffsetY;
-y:= AMyOffset + 123;
+y:= AMyOffset;
 dec(y, BORDERSIZE);
 DrawSprite(sprAMCorners, x - BORDERSIZE, y, 0);
 for i:= 0 to cMaxSlotAmmoIndex do
--- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj	Sun May 16 17:23:30 2010 +0000
+++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj	Sun May 16 18:12:10 2010 +0000
@@ -124,13 +124,13 @@
 		61A118D411683CD100359010 /* Multiplayer.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FD9D11155A41000C2203D /* Multiplayer.png */; };
 		61A118D511683CD100359010 /* NetworkPlay.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FD9CF1155A40700C2203D /* NetworkPlay.png */; };
 		61A11A4E1168D13600359010 /* PopoverMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A11A4D1168D13600359010 /* PopoverMenuViewController.m */; };
-		61A11AC11168D8B600359010 /* SplitViewRootController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */; };
 		61A11AC91168DA9400359010 /* MasterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A11AC81168DA9400359010 /* MasterViewController.m */; };
 		61A11ACF1168DB1B00359010 /* TeamSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A11ACE1168DB1B00359010 /* TeamSettingsViewController.m */; };
 		61A11AD61168DB3700359010 /* DetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A11AD51168DB3700359010 /* DetailViewController.m */; };
 		61A11AE11168DC6E00359010 /* SingleTeamViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */; };
 		61A11AE41168DC9400359010 /* HogHatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */; };
 		61AA7ACA117FCC8200FDDD4D /* openalbridge_t.h in Headers */ = {isa = PBXBuildFile; fileRef = 61AA7AC9117FCC8200FDDD4D /* openalbridge_t.h */; };
+		61AE62C711A067FE008DC32E /* SplitViewRootController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */; };
 		61B22E0F1180FBF400B2FCE0 /* MapConfigViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61B22E0D1180FBF400B2FCE0 /* MapConfigViewController.m */; };
 		61C325451179A336001E70B1 /* globals.h in Headers */ = {isa = PBXBuildFile; fileRef = 61C3253B1179A336001E70B1 /* globals.h */; };
 		61C325461179A336001E70B1 /* loaders.c in Sources */ = {isa = PBXBuildFile; fileRef = 61C3253C1179A336001E70B1 /* loaders.c */; };
@@ -291,8 +291,6 @@
 		6179885A114AA48A00BA94A9 /* PascalImports.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PascalImports.h; path = ../../cocoaTouch/otherSrc/PascalImports.h; sourceTree = SOURCE_ROOT; };
 		61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_uikitappdelegate.h; path = ../../cocoaTouch/SDLOverrides/SDL_uikitappdelegate.h; sourceTree = SOURCE_ROOT; };
 		61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDL_uikitappdelegate.m; path = ../../cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m; sourceTree = SOURCE_ROOT; };
-		61798867114AA4AA00BA94A9 /* SDL_uikitwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_uikitwindow.h; path = ../../cocoaTouch/SDLOverrides/SDL_uikitwindow.h; sourceTree = SOURCE_ROOT; };
-		61798868114AA4AA00BA94A9 /* SDL_uikitwindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDL_uikitwindow.m; path = ../../cocoaTouch/SDLOverrides/SDL_uikitwindow.m; sourceTree = SOURCE_ROOT; };
 		6179886E114AA4D000BA94A9 /* MainMenuViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MainMenuViewController.h; path = ../../cocoaTouch/MainMenuViewController.h; sourceTree = SOURCE_ROOT; };
 		6179886F114AA4D000BA94A9 /* MainMenuViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MainMenuViewController.m; path = ../../cocoaTouch/MainMenuViewController.m; sourceTree = SOURCE_ROOT; };
 		61798887114AA4E600BA94A9 /* GameSetup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GameSetup.h; path = ../../cocoaTouch/GameSetup.h; sourceTree = SOURCE_ROOT; };
@@ -418,7 +416,6 @@
 		080E96DDFE201D6D7F000001 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
-				61798860114AA49D00BA94A9 /* SDLOverrides */,
 				61A118481168371400359010 /* Frontend */,
 				61798887114AA4E600BA94A9 /* GameSetup.h */,
 				61798888114AA4E600BA94A9 /* GameSetup.m */,
@@ -454,6 +451,8 @@
 		29B97315FDCFA39411CA2CEA /* Other Sources */ = {
 			isa = PBXGroup;
 			children = (
+				61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */,
+				61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */,
 				61C325371179A325001E70B1 /* openalbridge */,
 				612724D1117E28AF005B90CF /* HogButtonView.h */,
 				612724D2117E28AF005B90CF /* HogButtonView.m */,
@@ -576,17 +575,6 @@
 			name = "Game Config";
 			sourceTree = "<group>";
 		};
-		61798860114AA49D00BA94A9 /* SDLOverrides */ = {
-			isa = PBXGroup;
-			children = (
-				61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */,
-				61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */,
-				61798867114AA4AA00BA94A9 /* SDL_uikitwindow.h */,
-				61798868114AA4AA00BA94A9 /* SDL_uikitwindow.m */,
-			);
-			name = SDLOverrides;
-			sourceTree = "<group>";
-		};
 		61798892114AA56300BA94A9 /* inc */ = {
 			isa = PBXGroup;
 			children = (
@@ -1079,7 +1067,6 @@
 				61798889114AA4E600BA94A9 /* GameSetup.m in Sources */,
 				61CE250D115E749A0098C467 /* OverlayViewController.m in Sources */,
 				61A11A4E1168D13600359010 /* PopoverMenuViewController.m in Sources */,
-				61A11AC11168D8B600359010 /* SplitViewRootController.m in Sources */,
 				61A11AC91168DA9400359010 /* MasterViewController.m in Sources */,
 				61A11ACF1168DB1B00359010 /* TeamSettingsViewController.m in Sources */,
 				61A11AD61168DB3700359010 /* DetailViewController.m in Sources */,
@@ -1100,6 +1087,7 @@
 				612724D3117E28AF005B90CF /* HogButtonView.m in Sources */,
 				61CF4971117E702F00BF05B7 /* SquareButtonView.m in Sources */,
 				61B22E0F1180FBF400B2FCE0 /* MapConfigViewController.m in Sources */,
+				61AE62C711A067FE008DC32E /* SplitViewRootController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1173,7 +1161,7 @@
 		6137064B117B1CB3004EE44A /* Distribution */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CODE_SIGN_ENTITLEMENTS = "Entitlements-Distribution.plist";
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
@@ -1376,7 +1364,7 @@
 		C01FCF4F08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+				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 = stabs;
@@ -1415,7 +1403,7 @@
 		C01FCF5008A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+				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";