ios sanity restored: applied new paths for sdl projects, turned off fullscreen, added 3 lines of documentation, removal of sdl patch (every mod has been integrated mainstream)
--- a/hedgewars/hwengine.pas Thu Jan 26 22:20:21 2012 +0100
+++ b/hedgewars/hwengine.pas Thu Jan 26 23:54:53 2012 +0100
@@ -295,7 +295,6 @@
begin
{$IFDEF HWLIBRARY}
cBits:= 32;
- cFullScreen:= true;
cTimerInterval:= 8;
cShowFPS:= {$IFDEF DEBUGFILE}true{$ELSE}false{$ENDIF};
val(gameArgs[0], ipcPort);
@@ -303,6 +302,8 @@
val(gameArgs[2], cScreenHeight);
val(gameArgs[3], cReducedQuality);
cLocaleFName:= gameArgs[4];
+ // cFullScreen functionality is platform dependent, ifdef it if you need to modify it
+ cFullScreen:= false;
if (Length(cLocaleFName) > 6) then
cLocale := Copy(cLocaleFName,1,5)
--- a/hedgewars/uWorld.pas Thu Jan 26 22:20:21 2012 +0100
+++ b/hedgewars/uWorld.pas Thu Jan 26 23:54:53 2012 +0100
@@ -191,6 +191,9 @@
prevPoint.Y:= cScreenHeight div 2;
WorldDx:= - (LAND_WIDTH div 2) + cScreenWidth div 2;
WorldDy:= - (LAND_HEIGHT - (playHeight div 2)) + (cScreenHeight div 2);
+// AMSlotSize is the active dimension of the ammo icon
+// AMWidth is the horizontal size of the whole ammomenu
+// cMaxSlotIndex is the amount of weapons per row
AMSlotSize:= 33;
{$IFDEF MOBILE}
if isPhone() then
--- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Thu Jan 26 22:20:21 2012 +0100
+++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Thu Jan 26 23:54:53 2012 +0100
@@ -201,6 +201,11 @@
619C5AF4124F7E3100D041AE /* LuaPas.pas in Sources */ = {isa = PBXBuildFile; fileRef = 619C5AF3124F7E3100D041AE /* LuaPas.pas */; };
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, ); }; };
+ 61A19AFC14D20170004B1E6D /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61A19AEA14D2010A004B1E6D /* libSDL.a */; };
+ 61A19B7714D20B7A004B1E6D /* libSDL_image.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61A19B6614D20B6C004B1E6D /* libSDL_image.a */; };
+ 61A19BC714D20CE7004B1E6D /* libSDL_ttf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61A19BC614D20CDA004B1E6D /* libSDL_ttf.a */; };
+ 61A19BFA14D20D95004B1E6D /* libSDL_net.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61A19BF914D20D83004B1E6D /* libSDL_net.a */; };
+ 61A19C2414D20F5A004B1E6D /* libSDL_mixer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61A19C2314D20F51004B1E6D /* libSDL_mixer.a */; };
61A4A39412A5CCC2004D81E6 /* uCommandHandlers.pas in Sources */ = {isa = PBXBuildFile; fileRef = 61A4A38912A5CCC2004D81E6 /* uCommandHandlers.pas */; };
61A4A39512A5CCC2004D81E6 /* uCommands.pas in Sources */ = {isa = PBXBuildFile; fileRef = 61A4A38A12A5CCC2004D81E6 /* uCommands.pas */; };
61A4A39612A5CCC2004D81E6 /* uDebug.pas in Sources */ = {isa = PBXBuildFile; fileRef = 61A4A38B12A5CCC2004D81E6 /* uDebug.pas */; };
@@ -220,11 +225,6 @@
61AC067412B2E32D000B52A2 /* Appirater.m in Sources */ = {isa = PBXBuildFile; fileRef = 61AC067312B2E32D000B52A2 /* Appirater.m */; };
61B3D71C11EA6F2700EC7420 /* uKeys.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; };
61B7A33812CC21080086B604 /* StatsPageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61B7A33712CC21080086B604 /* StatsPageViewController.m */; };
- 61B7A61512FA13B00051E14E /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61B7A54E12FA129F0051E14E /* libSDL.a */; };
- 61B7A61612FA13B00051E14E /* libSDL_image.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61B7A55812FA12AD0051E14E /* libSDL_image.a */; };
- 61B7A61712FA13B00051E14E /* libSDL_mixer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61B7A56012FA12BF0051E14E /* libSDL_mixer.a */; };
- 61B7A61812FA13B00051E14E /* libSDL_net.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61B7A56812FA12D00051E14E /* libSDL_net.a */; };
- 61B7A61912FA13B00051E14E /* libSDL_ttf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61B7A59012FA13330051E14E /* libSDL_ttf.a */; };
61B9A86814423A9D001541C1 /* GameConfigViewController-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61B9A86714423A9D001541C1 /* GameConfigViewController-iPad.xib */; };
61C079E411F35A300072BF46 /* EditableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 61C079E311F35A300072BF46 /* EditableCellView.m */; };
61C28D3F142D380400DA16C2 /* AudioManagerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61C28D3E142D380400DA16C2 /* AudioManagerController.m */; };
@@ -302,46 +302,46 @@
remoteGlobalIDString = D2AAC07E0554694100DB518D;
remoteInfo = libFreetype;
};
- 61B7A54D12FA129F0051E14E /* PBXContainerItemProxy */ = {
+ 61A19AE914D2010A004B1E6D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 617988D3114AAA3900BA94A9 /* SDLiPhoneOS.xcodeproj */;
+ containerPortal = 61A19AE314D2010A004B1E6D /* SDL.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = FD6526630DE8FCCB002AD96B;
- remoteInfo = StaticLibiPhoneOS;
+ remoteGlobalIDString = FD6526630DE8FCCB002AD96B /* libSDL.a */;
+ remoteInfo = libSDL;
};
- 61B7A54F12FA129F0051E14E /* PBXContainerItemProxy */ = {
+ 61A19AEB14D2010A004B1E6D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 617988D3114AAA3900BA94A9 /* SDLiPhoneOS.xcodeproj */;
+ containerPortal = 61A19AE314D2010A004B1E6D /* SDL.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 006E982211955059001DE610;
+ remoteGlobalIDString = 006E982211955059001DE610 /* testsdl.app */;
remoteInfo = testsdl;
};
- 61B7A55712FA12AD0051E14E /* PBXContainerItemProxy */ = {
+ 61A19B6514D20B6C004B1E6D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 6127232E117DF752005B90CF /* SDL_image.xcodeproj */;
+ containerPortal = 61A19B6114D20B6C004B1E6D /* SDL_image.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = BE1FA74107AF4C45004B6283;
+ remoteGlobalIDString = BE1FA74107AF4C45004B6283 /* libSDL_image.a */;
+ remoteInfo = libSDL_image;
+ };
+ 61A19BC514D20CDA004B1E6D /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 61A19BC114D20CDA004B1E6D /* SDL_ttf.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = BE48FD6E07AFA17000BB41DA /* libSDL_ttf.a */;
remoteInfo = "Static Library";
};
- 61B7A55F12FA12BF0051E14E /* PBXContainerItemProxy */ = {
+ 61A19BF814D20D83004B1E6D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 6179898B114AB3FA00BA94A9 /* SDL_mixer.xcodeproj */;
+ containerPortal = 61A19BF414D20D83004B1E6D /* SDL_net.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = BE1FA95407AF96B2004B6283;
+ remoteGlobalIDString = BE48FF6F07AFA9A900BB41DA /* libSDL_net.a */;
remoteInfo = "Static Library";
};
- 61B7A56712FA12D00051E14E /* PBXContainerItemProxy */ = {
+ 61A19C2214D20F51004B1E6D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 618E27B612A2C30700C20EF0 /* SDL_net.xcodeproj */;
+ containerPortal = 61A19C1E14D20F51004B1E6D /* SDL_mixer.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = BE48FF6F07AFA9A900BB41DA;
- remoteInfo = "Static Library";
- };
- 61B7A58F12FA13330051E14E /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 61798A0B114AB65600BA94A9 /* SDL_ttf.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = BE48FD6E07AFA17000BB41DA;
+ remoteGlobalIDString = BE1FA95407AF96B2004B6283 /* libSDL_mixer.a */;
remoteInfo = "Static Library";
};
928301590F10E41300CC5A3C /* PBXContainerItemProxy */ = {
@@ -420,7 +420,6 @@
611EEBC3122B355700DF6938 /* helpright.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpright.png; path = Resources/Overlay/helpright.png; sourceTree = "<group>"; };
611EEC30122B54D700DF6938 /* helpplain.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpplain.png; path = Resources/Overlay/helpplain.png; sourceTree = "<group>"; };
611F4D4A11B27A9900F9759A /* uScript.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = uScript.pas; path = ../../hedgewars/uScript.pas; sourceTree = SOURCE_ROOT; };
- 6127232E117DF752005B90CF /* SDL_image.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_image.xcodeproj; path = ../../../Library/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; };
6129B9F611EFB04D0017E305 /* denied.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = denied.png; path = Resources/denied.png; sourceTree = "<group>"; };
612CABAA1391CE68005E9596 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
@@ -577,10 +576,7 @@
6179880C114AA34C00BA94A9 /* uTeams.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = uTeams.pas; path = ../../hedgewars/uTeams.pas; sourceTree = SOURCE_ROOT; };
6179880E114AA34C00BA94A9 /* uVisualGears.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = uVisualGears.pas; path = ../../hedgewars/uVisualGears.pas; sourceTree = SOURCE_ROOT; };
6179880F114AA34C00BA94A9 /* uWorld.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = uWorld.pas; path = ../../hedgewars/uWorld.pas; sourceTree = SOURCE_ROOT; };
- 617988D3114AAA3900BA94A9 /* SDLiPhoneOS.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDLiPhoneOS.xcodeproj; path = "../../../Library/SDL/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj"; sourceTree = SOURCE_ROOT; };
61798934114AB25F00BA94A9 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
- 6179898B114AB3FA00BA94A9 /* SDL_mixer.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_mixer.xcodeproj; path = "../../../Library/SDL_mixer/Xcode-iPhoneOS/SDL_mixer.xcodeproj"; sourceTree = SOURCE_ROOT; };
- 61798A0B114AB65600BA94A9 /* SDL_ttf.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_ttf.xcodeproj; path = "../../../Library/SDL_ttf/Xcode-iPhoneOS/SDL_ttf.xcodeproj"; sourceTree = SOURCE_ROOT; };
61798A5E114AE08600BA94A9 /* Data */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Data; path = ../../../trunk/project_files/HedgewarsMobile/Data; sourceTree = "<group>"; };
617BC22D1490210E00E1C294 /* Italian */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Italian; path = Locale/Italian.lproj/About.strings; sourceTree = "<group>"; };
617BC2391490211500E1C294 /* Italian */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Italian; path = Locale/Italian.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -592,7 +588,6 @@
61842B3F122B66280096E335 /* helpleft.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpleft.png; path = Resources/Overlay/helpleft.png; sourceTree = "<group>"; };
618899811299516000D55FD6 /* title@2x~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "title@2x~iphone.png"; path = "Resources/Frontend/title@2x~iphone.png"; sourceTree = "<group>"; };
61889984129995B500D55FD6 /* title~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "title~ipad.png"; path = "Resources/Frontend/title~ipad.png"; sourceTree = "<group>"; };
- 618E27B612A2C30700C20EF0 /* SDL_net.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_net.xcodeproj; path = "../../../Library/SDL_net/Xcode-iPhoneOS/SDL_net.xcodeproj"; sourceTree = SOURCE_ROOT; };
61915D58143A4E2C00299991 /* MissionTrainingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MissionTrainingViewController.h; sourceTree = "<group>"; };
61915D59143A4E2C00299991 /* MissionTrainingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MissionTrainingViewController.m; sourceTree = "<group>"; };
61915D5A143A4E2C00299991 /* MissionTrainingViewController-iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = "MissionTrainingViewController-iPhone.xib"; sourceTree = "<group>"; };
@@ -611,6 +606,11 @@
619C5BA0124FA59000D041AE /* MapPreviewButtonView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MapPreviewButtonView.h; path = Classes/MapPreviewButtonView.h; sourceTree = "<group>"; };
619C5BA1124FA59000D041AE /* MapPreviewButtonView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MapPreviewButtonView.m; path = Classes/MapPreviewButtonView.m; sourceTree = "<group>"; };
61A117FE1168322700359010 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
+ 61A19AE314D2010A004B1E6D /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = "../../../Library/SDL/Xcode-iOS/SDL/SDL.xcodeproj"; sourceTree = SOURCE_ROOT; };
+ 61A19B6114D20B6C004B1E6D /* SDL_image.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_image.xcodeproj; path = "../../../Library/SDL_image/Xcode-iOS/SDL_image.xcodeproj"; sourceTree = SOURCE_ROOT; };
+ 61A19BC114D20CDA004B1E6D /* SDL_ttf.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_ttf.xcodeproj; path = "../../../Library/SDL_ttf/Xcode-iOS/SDL_ttf.xcodeproj"; sourceTree = SOURCE_ROOT; };
+ 61A19BF414D20D83004B1E6D /* SDL_net.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_net.xcodeproj; path = "../../../Library/SDL_net/Xcode-iOS/SDL_net.xcodeproj"; sourceTree = SOURCE_ROOT; };
+ 61A19C1E14D20F51004B1E6D /* SDL_mixer.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_mixer.xcodeproj; path = "../../../Library/SDL_mixer/Xcode-iOS/SDL_mixer.xcodeproj"; sourceTree = SOURCE_ROOT; };
61A4A38912A5CCC2004D81E6 /* uCommandHandlers.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = uCommandHandlers.pas; path = ../../hedgewars/uCommandHandlers.pas; sourceTree = SOURCE_ROOT; };
61A4A38A12A5CCC2004D81E6 /* uCommands.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = uCommands.pas; path = ../../hedgewars/uCommands.pas; sourceTree = SOURCE_ROOT; };
61A4A38B12A5CCC2004D81E6 /* uDebug.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = uDebug.pas; path = ../../hedgewars/uDebug.pas; sourceTree = SOURCE_ROOT; };
@@ -700,11 +700,11 @@
619599C01364E66B00B429B6 /* libFreetype.a in Frameworks */,
619599451364C83D00B429B6 /* libLua.a in Frameworks */,
6195981F1364BCEF00B429B6 /* libTremor.a in Frameworks */,
- 61B7A61512FA13B00051E14E /* libSDL.a in Frameworks */,
- 61B7A61612FA13B00051E14E /* libSDL_image.a in Frameworks */,
- 61B7A61712FA13B00051E14E /* libSDL_mixer.a in Frameworks */,
- 61B7A61812FA13B00051E14E /* libSDL_net.a in Frameworks */,
- 61B7A61912FA13B00051E14E /* libSDL_ttf.a in Frameworks */,
+ 61A19AFC14D20170004B1E6D /* libSDL.a in Frameworks */,
+ 61A19B7714D20B7A004B1E6D /* libSDL_image.a in Frameworks */,
+ 61A19C2414D20F5A004B1E6D /* libSDL_mixer.a in Frameworks */,
+ 61A19BFA14D20D95004B1E6D /* libSDL_net.a in Frameworks */,
+ 61A19BC714D20CE7004B1E6D /* libSDL_ttf.a in Frameworks */,
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
61A1188511683A8C00359010 /* CoreGraphics.framework in Frameworks */,
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
@@ -818,11 +818,11 @@
619599BA1364E65900B429B6 /* Freetype.xcodeproj */,
6195993F1364C82B00B429B6 /* Lua.xcodeproj */,
619598181364BCD200B429B6 /* Tremor.xcodeproj */,
- 617988D3114AAA3900BA94A9 /* SDLiPhoneOS.xcodeproj */,
- 6127232E117DF752005B90CF /* SDL_image.xcodeproj */,
- 6179898B114AB3FA00BA94A9 /* SDL_mixer.xcodeproj */,
- 618E27B612A2C30700C20EF0 /* SDL_net.xcodeproj */,
- 61798A0B114AB65600BA94A9 /* SDL_ttf.xcodeproj */,
+ 61A19AE314D2010A004B1E6D /* SDL.xcodeproj */,
+ 61A19B6114D20B6C004B1E6D /* SDL_image.xcodeproj */,
+ 61A19C1E14D20F51004B1E6D /* SDL_mixer.xcodeproj */,
+ 61A19BF414D20D83004B1E6D /* SDL_net.xcodeproj */,
+ 61A19BC114D20CDA004B1E6D /* SDL_ttf.xcodeproj */,
61798934114AB25F00BA94A9 /* AudioToolbox.framework */,
612CABAA1391CE68005E9596 /* AVFoundation.framework */,
61A117FE1168322700359010 /* CoreGraphics.framework */,
@@ -1056,43 +1056,43 @@
name = Products;
sourceTree = "<group>";
};
- 61B7A54712FA129F0051E14E /* Products */ = {
+ 61A19AE414D2010A004B1E6D /* Products */ = {
isa = PBXGroup;
children = (
- 61B7A54E12FA129F0051E14E /* libSDL.a */,
- 61B7A55012FA129F0051E14E /* testsdl.app */,
+ 61A19AEA14D2010A004B1E6D /* libSDL.a */,
+ 61A19AEC14D2010A004B1E6D /* testsdl.app */,
);
name = Products;
sourceTree = "<group>";
};
- 61B7A55412FA12AD0051E14E /* Products */ = {
+ 61A19B6214D20B6C004B1E6D /* Products */ = {
isa = PBXGroup;
children = (
- 61B7A55812FA12AD0051E14E /* libSDL_image.a */,
+ 61A19B6614D20B6C004B1E6D /* libSDL_image.a */,
);
name = Products;
sourceTree = "<group>";
};
- 61B7A55C12FA12BF0051E14E /* Products */ = {
+ 61A19BC214D20CDA004B1E6D /* Products */ = {
isa = PBXGroup;
children = (
- 61B7A56012FA12BF0051E14E /* libSDL_mixer.a */,
+ 61A19BC614D20CDA004B1E6D /* libSDL_ttf.a */,
);
name = Products;
sourceTree = "<group>";
};
- 61B7A56412FA12D00051E14E /* Products */ = {
+ 61A19BF514D20D83004B1E6D /* Products */ = {
isa = PBXGroup;
children = (
- 61B7A56812FA12D00051E14E /* libSDL_net.a */,
+ 61A19BF914D20D83004B1E6D /* libSDL_net.a */,
);
name = Products;
sourceTree = "<group>";
};
- 61B7A58C12FA13330051E14E /* Products */ = {
+ 61A19C1F14D20F51004B1E6D /* Products */ = {
isa = PBXGroup;
children = (
- 61B7A59012FA13330051E14E /* libSDL_ttf.a */,
+ 61A19C2314D20F51004B1E6D /* libSDL_mixer.a */,
);
name = Products;
sourceTree = "<group>";
@@ -1348,24 +1348,24 @@
ProjectRef = 6195993F1364C82B00B429B6 /* Lua.xcodeproj */;
},
{
- ProductGroup = 61B7A55412FA12AD0051E14E /* Products */;
- ProjectRef = 6127232E117DF752005B90CF /* SDL_image.xcodeproj */;
+ ProductGroup = 61A19AE414D2010A004B1E6D /* Products */;
+ ProjectRef = 61A19AE314D2010A004B1E6D /* SDL.xcodeproj */;
},
{
- ProductGroup = 61B7A55C12FA12BF0051E14E /* Products */;
- ProjectRef = 6179898B114AB3FA00BA94A9 /* SDL_mixer.xcodeproj */;
+ ProductGroup = 61A19B6214D20B6C004B1E6D /* Products */;
+ ProjectRef = 61A19B6114D20B6C004B1E6D /* SDL_image.xcodeproj */;
},
{
- ProductGroup = 61B7A56412FA12D00051E14E /* Products */;
- ProjectRef = 618E27B612A2C30700C20EF0 /* SDL_net.xcodeproj */;
+ ProductGroup = 61A19C1F14D20F51004B1E6D /* Products */;
+ ProjectRef = 61A19C1E14D20F51004B1E6D /* SDL_mixer.xcodeproj */;
},
{
- ProductGroup = 61B7A58C12FA13330051E14E /* Products */;
- ProjectRef = 61798A0B114AB65600BA94A9 /* SDL_ttf.xcodeproj */;
+ ProductGroup = 61A19BF514D20D83004B1E6D /* Products */;
+ ProjectRef = 61A19BF414D20D83004B1E6D /* SDL_net.xcodeproj */;
},
{
- ProductGroup = 61B7A54712FA129F0051E14E /* Products */;
- ProjectRef = 617988D3114AAA3900BA94A9 /* SDLiPhoneOS.xcodeproj */;
+ ProductGroup = 61A19BC214D20CDA004B1E6D /* Products */;
+ ProjectRef = 61A19BC114D20CDA004B1E6D /* SDL_ttf.xcodeproj */;
},
{
ProductGroup = 619598191364BCD200B429B6 /* Products */;
@@ -1403,46 +1403,46 @@
remoteRef = 619599BE1364E65900B429B6 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 61B7A54E12FA129F0051E14E /* libSDL.a */ = {
+ 61A19AEA14D2010A004B1E6D /* libSDL.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libSDL.a;
- remoteRef = 61B7A54D12FA129F0051E14E /* PBXContainerItemProxy */;
+ remoteRef = 61A19AE914D2010A004B1E6D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 61B7A55012FA129F0051E14E /* testsdl.app */ = {
+ 61A19AEC14D2010A004B1E6D /* testsdl.app */ = {
isa = PBXReferenceProxy;
fileType = wrapper.application;
path = testsdl.app;
- remoteRef = 61B7A54F12FA129F0051E14E /* PBXContainerItemProxy */;
+ remoteRef = 61A19AEB14D2010A004B1E6D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 61B7A55812FA12AD0051E14E /* libSDL_image.a */ = {
+ 61A19B6614D20B6C004B1E6D /* libSDL_image.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libSDL_image.a;
- remoteRef = 61B7A55712FA12AD0051E14E /* PBXContainerItemProxy */;
+ remoteRef = 61A19B6514D20B6C004B1E6D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 61B7A56012FA12BF0051E14E /* libSDL_mixer.a */ = {
+ 61A19BC614D20CDA004B1E6D /* libSDL_ttf.a */ = {
+ isa = PBXReferenceProxy;
+ fileType = archive.ar;
+ path = libSDL_ttf.a;
+ remoteRef = 61A19BC514D20CDA004B1E6D /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+ 61A19BF914D20D83004B1E6D /* libSDL_net.a */ = {
+ isa = PBXReferenceProxy;
+ fileType = archive.ar;
+ path = libSDL_net.a;
+ remoteRef = 61A19BF814D20D83004B1E6D /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+ 61A19C2314D20F51004B1E6D /* libSDL_mixer.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libSDL_mixer.a;
- remoteRef = 61B7A55F12FA12BF0051E14E /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 61B7A56812FA12D00051E14E /* libSDL_net.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libSDL_net.a;
- remoteRef = 61B7A56712FA12D00051E14E /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 61B7A59012FA13330051E14E /* libSDL_ttf.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libSDL_ttf.a;
- remoteRef = 61B7A58F12FA13330051E14E /* PBXContainerItemProxy */;
+ remoteRef = 61A19C2214D20F51004B1E6D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
--- a/project_files/HedgewarsMobile/SDL-687400b595ab.patch Thu Jan 26 22:20:21 2012 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,198 +0,0 @@
-diff -r 687400b595ab Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj
---- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Sat Nov 19 19:23:33 2011 -0500
-+++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Sun Nov 20 18:57:07 2011 +0100
-@@ -1596,9 +1596,12 @@
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- GCC_C_LANGUAGE_STANDARD = c99;
- GCC_DEBUGGING_SYMBOLS = full;
-+ GCC_OPTIMIZATION_LEVEL = 0;
-+ GCC_THUMB_SUPPORT = NO;
-+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_UNUSED_VARIABLE = NO;
-- IPHONEOS_DEPLOYMENT_TARGET = 3.1.3;
-+ IPHONEOS_DEPLOYMENT_TARGET = 3.0;
- ONLY_ACTIVE_ARCH = NO;
- PREBINDING = NO;
- SDKROOT = iphoneos;
-@@ -1613,9 +1616,12 @@
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- GCC_C_LANGUAGE_STANDARD = c99;
-+ GCC_FAST_MATH = YES;
-+ GCC_THUMB_SUPPORT = NO;
-+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_UNUSED_VARIABLE = NO;
-- IPHONEOS_DEPLOYMENT_TARGET = 3.1.3;
-+ IPHONEOS_DEPLOYMENT_TARGET = 3.0;
- PREBINDING = NO;
- SDKROOT = iphoneos;
- TARGETED_DEVICE_FAMILY = "1,2";
-@@ -1630,6 +1636,7 @@
- DEPLOYMENT_LOCATION = NO;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_OPTIMIZATION_LEVEL = 0;
-+ GCC_PREPROCESSOR_DEFINITIONS = SDL_NO_COMPAT;
- PREBINDING = NO;
- PRODUCT_NAME = SDL;
- SKIP_INSTALL = YES;
-@@ -1644,6 +1651,7 @@
- DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- DEPLOYMENT_LOCATION = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
-+ GCC_PREPROCESSOR_DEFINITIONS = SDL_NO_COMPAT;
- PREBINDING = NO;
- PRODUCT_NAME = SDL;
- SKIP_INSTALL = YES;
-diff -r 687400b595ab include/SDL_compat.h
---- a/include/SDL_compat.h Sat Nov 19 19:23:33 2011 -0500
-+++ b/include/SDL_compat.h Sun Nov 20 18:57:07 2011 +0100
-@@ -40,7 +40,7 @@
-
- /*@}*/
-
--#ifdef SDL_NO_COMPAT
-+#ifndef SDL_NO_COMPAT
- #define _SDL_compat_h
- #endif
-
-diff -r 687400b595ab include/SDL_config_iphoneos.h
---- a/include/SDL_config_iphoneos.h Sat Nov 19 19:23:33 2011 -0500
-+++ b/include/SDL_config_iphoneos.h Sun Nov 20 18:57:07 2011 +0100
-@@ -106,7 +106,7 @@
- /* enable iPhone version of Core Audio driver */
- #define SDL_AUDIO_DRIVER_COREAUDIO 1
- /* Enable the dummy audio driver (src/audio/dummy/\*.c) */
--#define SDL_AUDIO_DRIVER_DUMMY 1
-+#define SDL_AUDIO_DRIVER_DUMMY 0
-
- /* Enable the stub haptic driver (src/haptic/dummy/\*.c) */
- #define SDL_HAPTIC_DISABLED 1
-@@ -132,16 +132,16 @@
- /* enable OpenGL ES */
- #define SDL_VIDEO_OPENGL_ES 1
- #define SDL_VIDEO_RENDER_OGL_ES 1
--#define SDL_VIDEO_RENDER_OGL_ES2 1
-+#define SDL_VIDEO_RENDER_OGL_ES2 0
-
- /* Enable system power support */
--#define SDL_POWER_UIKIT 1
-+#define SDL_POWER_UIKIT 0
-
- /* enable iPhone keyboard support */
- #define SDL_IPHONE_KEYBOARD 1
-
- /* enable joystick subsystem */
--#define SDL_JOYSTICK_DISABLED 0
-+#define SDL_JOYSTICK_DISABLED 1
-
- /* Set max recognized G-force from accelerometer
- See src/joystick/uikit/SDLUIAccelerationDelegate.m for notes on why this is needed
-diff -r 687400b595ab include/SDL_events.h
---- a/include/SDL_events.h Sat Nov 19 19:23:33 2011 -0500
-+++ b/include/SDL_events.h Sun Nov 20 18:57:07 2011 +0100
-@@ -107,11 +107,12 @@
-
- SDL_CLIPBOARDUPDATE = 0x900, /**< The clipboard changed */
-
-+#ifndef SDL_NO_COMPAT
- /* Obsolete events */
- SDL_EVENT_COMPAT1 = 0x7000, /**< SDL 1.2 events for compatibility */
- SDL_EVENT_COMPAT2,
- SDL_EVENT_COMPAT3,
--
-+#endif
-
- /** Events ::SDL_USEREVENT through ::SDL_LASTEVENT are for your use,
- * and should be allocated with SDL_RegisterEvents()
-diff -r 687400b595ab src/SDL_compat.c
---- a/src/SDL_compat.c Sat Nov 19 19:23:33 2011 -0500
-+++ b/src/SDL_compat.c Sun Nov 20 18:57:07 2011 +0100
-@@ -29,6 +29,7 @@
- #include "video/SDL_pixels_c.h"
- #include "render/SDL_yuv_sw_c.h"
-
-+#ifndef SDL_NO_COMPAT
-
- static SDL_Window *SDL_VideoWindow = NULL;
- static SDL_Surface *SDL_WindowSurface = NULL;
-@@ -1813,4 +1814,5 @@
- return 0;
- }
-
-+#endif /* SDL_NO_COMPAT */
- /* vi: set ts=4 sw=4 expandtab: */
-diff -r 687400b595ab src/video/SDL_surface.c
---- a/src/video/SDL_surface.c Sat Nov 19 19:23:33 2011 -0500
-+++ b/src/video/SDL_surface.c Sun Nov 20 18:57:07 2011 +0100
-@@ -195,12 +195,14 @@
- SDL_InvalidateMap(surface->map);
- }
-
-+#ifndef SDL_NO_COMPAT
- /* Compatibility mode */
- if (surface->map->info.flags & SDL_COPY_COLORKEY) {
- surface->flags |= SDL_SRCCOLORKEY;
- } else {
- surface->flags &= ~SDL_SRCCOLORKEY;
- }
-+#endif
-
- return 0;
- }
-@@ -405,12 +407,14 @@
- SDL_InvalidateMap(surface->map);
- }
-
-+#ifndef SDL_NO_COMPAT
- /* Compatibility mode */
- if (surface->map->info.flags & SDL_COPY_BLEND) {
- surface->flags |= SDL_SRCALPHA;
- } else {
- surface->flags &= ~SDL_SRCALPHA;
- }
-+#endif
-
- return status;
- }
-diff -r 687400b595ab src/video/uikit/SDL_uikitopenglview.m
---- a/src/video/uikit/SDL_uikitopenglview.m Sat Nov 19 19:23:33 2011 -0500
-+++ b/src/video/uikit/SDL_uikitopenglview.m Sun Nov 20 18:57:07 2011 +0100
-@@ -80,7 +80,7 @@
-
- // !!! FIXME: use the screen this is on!
- /* Use the main screen scale (for retina display support) */
-- if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)])
-+ if ([self respondsToSelector:@selector(contentScaleFactor)])
- self.contentScaleFactor = [UIScreen mainScreen].scale;
-
- /* create the buffers */
-diff -r 687400b595ab src/video/uikit/SDL_uikitviewcontroller.m
---- a/src/video/uikit/SDL_uikitviewcontroller.m Sat Nov 19 19:23:33 2011 -0500
-+++ b/src/video/uikit/SDL_uikitviewcontroller.m Sun Nov 20 18:57:07 2011 +0100
-@@ -29,9 +29,8 @@
- #include "../../events/SDL_events_c.h"
-
- #include "SDL_uikitwindow.h"
--
--#import "SDL_uikitviewcontroller.h"
--
-+#include "SDL_uikitviewcontroller.h"
-+#include "SDL_uikitvideo.h"
-
- @implementation SDL_uikitviewcontroller
-
-@@ -114,7 +113,11 @@
- const UIInterfaceOrientation toInterfaceOrientation = [self interfaceOrientation];
- SDL_WindowData *data = self->window->driverdata;
- UIWindow *uiwindow = data->uiwindow;
-- UIScreen *uiscreen = [uiwindow screen];
-+ UIScreen *uiscreen;
-+ if (SDL_UIKit_supports_multiple_displays)
-+ uiscreen = [uiwindow screen];
-+ else
-+ uiscreen = [UIScreen mainScreen];
- const int noborder = (self->window->flags & (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_BORDERLESS));
- CGRect frame = noborder ? [uiscreen bounds] : [uiscreen applicationFrame];
- const CGSize size = frame.size;