diff -r 6cdb427ef82c -r 8dae325dc625 project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj --- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Sun Nov 28 01:58:43 2010 +0100 +++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Sun Nov 28 23:49:09 2010 +0100 @@ -56,6 +56,8 @@ 615AD96212073B4D00F2FF04 /* startGameButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 615AD96112073B4D00F2FF04 /* startGameButton.png */; }; 615AD9E9120764CA00F2FF04 /* backButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 615AD9E8120764CA00F2FF04 /* backButton.png */; }; 615AD9EB1207654E00F2FF04 /* helpButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 615AD9EA1207654E00F2FF04 /* helpButton.png */; }; + 615FEAE212A2A6640098EE92 /* localplayButton~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 615FEADF12A2A6640098EE92 /* localplayButton~ipad.png */; }; + 615FEAE312A2A6640098EE92 /* localplayButton~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 615FEAE012A2A6640098EE92 /* localplayButton~iphone.png */; }; 6163EE7E11CC2600001C0453 /* SingleWeaponViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6163EE7D11CC2600001C0453 /* SingleWeaponViewController.m */; }; 6165920D11CA9BA200D6E256 /* FlagsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 616591E111CA9BA200D6E256 /* FlagsViewController.m */; }; 6165920E11CA9BA200D6E256 /* FortsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 616591E311CA9BA200D6E256 /* FortsViewController.m */; }; @@ -126,7 +128,6 @@ 617988DB114AAA4200BA94A9 /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 617988DA114AAA3900BA94A9 /* libSDLiPhoneOS.a */; }; 61798935114AB25F00BA94A9 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798934114AB25F00BA94A9 /* AudioToolbox.framework */; }; 61798996114AB3FF00BA94A9 /* libSDL_mixer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798993114AB3FA00BA94A9 /* libSDL_mixer.a */; }; - 617989BE114AB47A00BA94A9 /* libSDL_net.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 617989BB114AB47500BA94A9 /* libSDL_net.a */; }; 61798A14114AB65C00BA94A9 /* libSDL_ttf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798A13114AB65600BA94A9 /* libSDL_ttf.a */; }; 61799289114AE08700BA94A9 /* Data in Resources */ = {isa = PBXBuildFile; fileRef = 61798A5E114AE08600BA94A9 /* Data */; }; 61808A5D128C930A005D0E2F /* backSound.wav in Resources */ = {isa = PBXBuildFile; fileRef = 611EE9D7122AA10A00DF6938 /* backSound.wav */; }; @@ -135,6 +136,7 @@ 61842B40122B66280096E335 /* helpleft.png in Resources */ = {isa = PBXBuildFile; fileRef = 61842B3F122B66280096E335 /* helpleft.png */; }; 6187AEBD120781B900B31A27 /* Settings in Resources */ = {isa = PBXBuildFile; fileRef = 6187AEA5120781B900B31A27 /* Settings */; }; 61889985129995B500D55FD6 /* title~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 61889984129995B500D55FD6 /* title~ipad.png */; }; + 618E27BC12A2C32600C20EF0 /* libSDL_net.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 618E27BB12A2C30700C20EF0 /* libSDL_net.a */; }; 6199E81612463EA800DADF8C /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6199E81512463EA800DADF8C /* CFNetwork.framework */; }; 6199E81A12463EC400DADF8C /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6199E81912463EC400DADF8C /* SystemConfiguration.framework */; }; 6199E839124647DE00DADF8C /* SupportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6199E837124647DE00DADF8C /* SupportViewController.m */; }; @@ -174,7 +176,6 @@ 61F7A43E11E290650040BA66 /* iTunesArtwork.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A43711E290650040BA66 /* iTunesArtwork.png */; }; 61F9040911DF58B00068B24D /* settingsButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F9040811DF58B00068B24D /* settingsButton.png */; }; 61F9040B11DF59370068B24D /* background.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F9040A11DF59370068B24D /* background.png */; }; - 61F9040E11DF59D10068B24D /* localplayButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F9040C11DF59D10068B24D /* localplayButton.png */; }; 61F904D711DF7DA30068B24D /* WeaponCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 61F904D611DF7DA30068B24D /* WeaponCellView.m */; }; 922F64900F10F53100DC6EC0 /* libfpc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 928301170F10CAFC00CC5A3C /* libfpc.a */; }; /* End PBXBuildFile section */ @@ -669,13 +670,6 @@ remoteGlobalIDString = BE1FA95407AF96B2004B6283; remoteInfo = "Static Library"; }; - 617989BA114AB47500BA94A9 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 617989B3114AB47500BA94A9 /* SDL_net.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = BE48FF6F07AFA9A900BB41DA; - remoteInfo = "Static Library"; - }; 61798A12114AB65600BA94A9 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 61798A0B114AB65600BA94A9 /* SDL_ttf.xcodeproj */; @@ -690,6 +684,13 @@ remoteGlobalIDString = 006E982211955059001DE610; remoteInfo = testsdl; }; + 618E27BA12A2C30700C20EF0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 618E27B612A2C30700C20EF0 /* SDL_net.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = BE48FF6F07AFA9A900BB41DA /* libSDL_net.a */; + remoteInfo = "Static Library"; + }; 619C5AC9124F7DDF00D041AE /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 619C5AC0124F7DDF00D041AE /* Lua.xcodeproj */; @@ -772,6 +773,10 @@ 615AD96112073B4D00F2FF04 /* startGameButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = startGameButton.png; path = Resources/Frontend/startGameButton.png; sourceTree = ""; }; 615AD9E8120764CA00F2FF04 /* backButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backButton.png; path = Resources/Frontend/backButton.png; sourceTree = ""; }; 615AD9EA1207654E00F2FF04 /* helpButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpButton.png; path = Resources/Frontend/helpButton.png; sourceTree = ""; }; + 615FEAD912A2A4C10098EE92 /* checkbox@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "checkbox@2x.png"; path = "Resources/Icons/checkbox@2x.png"; sourceTree = ""; }; + 615FEADE12A2A6640098EE92 /* localplayButton@2x~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "localplayButton@2x~iphone.png"; path = "Resources/Frontend/localplayButton@2x~iphone.png"; sourceTree = ""; }; + 615FEADF12A2A6640098EE92 /* localplayButton~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "localplayButton~ipad.png"; path = "Resources/Frontend/localplayButton~ipad.png"; sourceTree = ""; }; + 615FEAE012A2A6640098EE92 /* localplayButton~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "localplayButton~iphone.png"; path = "Resources/Frontend/localplayButton~iphone.png"; sourceTree = ""; }; 6163EE7C11CC2600001C0453 /* SingleWeaponViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SingleWeaponViewController.h; sourceTree = ""; }; 6163EE7D11CC2600001C0453 /* SingleWeaponViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SingleWeaponViewController.m; sourceTree = ""; }; 616591E011CA9BA200D6E256 /* FlagsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FlagsViewController.h; sourceTree = ""; }; @@ -888,7 +893,6 @@ 617988D3114AAA3900BA94A9 /* SDLiPhoneOS.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDLiPhoneOS.xcodeproj; path = "../../../Library/SDL-1.3/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-1.3/SDL_mixer/Xcode-iPhoneOS/SDL_mixer.xcodeproj"; sourceTree = SOURCE_ROOT; }; - 617989B3114AB47500BA94A9 /* SDL_net.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_net.xcodeproj; path = "../../../Library/SDL-1.3/SDL_net/Xcode-iPhoneOS/SDL_net.xcodeproj"; sourceTree = SOURCE_ROOT; }; 61798A0B114AB65600BA94A9 /* SDL_ttf.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_ttf.xcodeproj; path = "../../../Library/SDL-1.3/SDL_ttf/Xcode-iPhoneOS/SDL_ttf.xcodeproj"; sourceTree = SOURCE_ROOT; }; 61798A5E114AE08600BA94A9 /* Data */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Data; sourceTree = ""; }; 6183D83C11E2BCE200A88903 /* Default-ipad-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-ipad-Landscape.png"; path = "Resources/Icons/Default-ipad-Landscape.png"; sourceTree = ""; }; @@ -900,6 +904,7 @@ 6187AEA5120781B900B31A27 /* Settings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Settings; path = Resources/Settings; sourceTree = ""; }; 618899811299516000D55FD6 /* title@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "title@2x.png"; path = "Resources/Frontend/title@2x.png"; sourceTree = ""; }; 61889984129995B500D55FD6 /* title~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "title~ipad.png"; path = "Resources/Frontend/title~ipad.png"; sourceTree = ""; }; + 618E27B612A2C30700C20EF0 /* SDL_net.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_net.xcodeproj; path = "../../../Library/SDL-1.3/SDL_net/Xcode-iPhoneOS/SDL_net.xcodeproj"; sourceTree = SOURCE_ROOT; }; 6199E81512463EA800DADF8C /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; 6199E81912463EC400DADF8C /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; 6199E836124647DE00DADF8C /* SupportViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SupportViewController.h; sourceTree = ""; }; @@ -943,7 +948,6 @@ 61F7A43711E290650040BA66 /* iTunesArtwork.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = iTunesArtwork.png; path = Resources/Icons/iTunesArtwork.png; sourceTree = ""; }; 61F9040811DF58B00068B24D /* settingsButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = settingsButton.png; path = Resources/Frontend/settingsButton.png; sourceTree = ""; }; 61F9040A11DF59370068B24D /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = background.png; path = Resources/Frontend/background.png; sourceTree = ""; }; - 61F9040C11DF59D10068B24D /* localplayButton.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = localplayButton.png; path = Resources/Frontend/localplayButton.png; sourceTree = ""; }; 61F9040D11DF59D10068B24D /* netplayButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = netplayButton.png; path = Resources/Frontend/netplayButton.png; sourceTree = ""; }; 61F904D511DF7DA30068B24D /* WeaponCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeaponCellView.h; sourceTree = ""; }; 61F904D611DF7DA30068B24D /* WeaponCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WeaponCellView.m; sourceTree = ""; }; @@ -956,8 +960,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 618E27BC12A2C32600C20EF0 /* libSDL_net.a in Frameworks */, 61798A14114AB65C00BA94A9 /* libSDL_ttf.a in Frameworks */, - 617989BE114AB47A00BA94A9 /* libSDL_net.a in Frameworks */, 61272334117DF764005B90CF /* libSDL_image.a in Frameworks */, 61798996114AB3FF00BA94A9 /* libSDL_mixer.a in Frameworks */, 617988DB114AAA4200BA94A9 /* libSDLiPhoneOS.a in Frameworks */, @@ -1075,8 +1079,8 @@ 611E0E4B11FA92130077A41E /* freetype.xcodeproj */, 617988D3114AAA3900BA94A9 /* SDLiPhoneOS.xcodeproj */, 6127232E117DF752005B90CF /* SDL_image.xcodeproj */, - 617989B3114AB47500BA94A9 /* SDL_net.xcodeproj */, 6179898B114AB3FA00BA94A9 /* SDL_mixer.xcodeproj */, + 618E27B612A2C30700C20EF0 /* SDL_net.xcodeproj */, 61798A0B114AB65600BA94A9 /* SDL_ttf.xcodeproj */, 61798934114AB25F00BA94A9 /* AudioToolbox.framework */, 61A117FE1168322700359010 /* CoreGraphics.framework */, @@ -1328,14 +1332,6 @@ name = Products; sourceTree = ""; }; - 617989B4114AB47500BA94A9 /* Products */ = { - isa = PBXGroup; - children = ( - 617989BB114AB47500BA94A9 /* libSDL_net.a */, - ); - name = Products; - sourceTree = ""; - }; 61798A0C114AB65600BA94A9 /* Products */ = { isa = PBXGroup; children = ( @@ -1369,6 +1365,14 @@ name = Overlay; sourceTree = ""; }; + 618E27B712A2C30700C20EF0 /* Products */ = { + isa = PBXGroup; + children = ( + 618E27BB12A2C30700C20EF0 /* libSDL_net.a */, + ); + name = Products; + sourceTree = ""; + }; 619C5AC1124F7DDF00D041AE /* Products */ = { isa = PBXGroup; children = ( @@ -1398,6 +1402,7 @@ 611DA1CF124E5C6300008271 /* plus.png */, 6103D413129B417500911D8D /* plus@2x.png */, 61F2E7EB12060E31005734F7 /* checkbox.png */, + 615FEAD912A2A4C10098EE92 /* checkbox@2x.png */, 61D3D2A41290E03A003CE7C3 /* irc.png */, 6103D384129B347700911D8D /* irc@2x.png */, 61E2F7421283752C00E12521 /* fb.png */, @@ -1429,7 +1434,9 @@ 615AD9E8120764CA00F2FF04 /* backButton.png */, 6172FED31298CE6600D73365 /* backButton@2x.png */, 615AD96112073B4D00F2FF04 /* startGameButton.png */, - 61F9040C11DF59D10068B24D /* localplayButton.png */, + 615FEADE12A2A6640098EE92 /* localplayButton@2x~iphone.png */, + 615FEADF12A2A6640098EE92 /* localplayButton~ipad.png */, + 615FEAE012A2A6640098EE92 /* localplayButton~iphone.png */, 61F9040D11DF59D10068B24D /* netplayButton.png */, 61EBA62811DFF2BC0048B68A /* title.png */, 618899811299516000D55FD6 /* title@2x.png */, @@ -1569,8 +1576,8 @@ ProjectRef = 6179898B114AB3FA00BA94A9 /* SDL_mixer.xcodeproj */; }, { - ProductGroup = 617989B4114AB47500BA94A9 /* Products */; - ProjectRef = 617989B3114AB47500BA94A9 /* SDL_net.xcodeproj */; + ProductGroup = 618E27B712A2C30700C20EF0 /* Products */; + ProjectRef = 618E27B612A2C30700C20EF0 /* SDL_net.xcodeproj */; }, { ProductGroup = 61798A0C114AB65600BA94A9 /* Products */; @@ -2067,13 +2074,6 @@ remoteRef = 61798992114AB3FA00BA94A9 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 617989BB114AB47500BA94A9 /* libSDL_net.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libSDL_net.a; - remoteRef = 617989BA114AB47500BA94A9 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 61798A13114AB65600BA94A9 /* libSDL_ttf.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -2088,6 +2088,13 @@ remoteRef = 6184608B11DA8BF3000E1314 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 618E27BB12A2C30700C20EF0 /* libSDL_net.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libSDL_net.a; + remoteRef = 618E27BA12A2C30700C20EF0 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 619C5ACA124F7DDF00D041AE /* Lua.app */ = { isa = PBXReferenceProxy; fileType = wrapper.application; @@ -2132,7 +2139,6 @@ 61EF921411DF57AC003441C4 /* joyButtonForwardJump.png in Resources */, 61F9040911DF58B00068B24D /* settingsButton.png in Resources */, 61F9040B11DF59370068B24D /* background.png in Resources */, - 61F9040E11DF59D10068B24D /* localplayButton.png in Resources */, 61EBA62A11DFF2BC0048B68A /* title.png in Resources */, 61F7A43811E290650040BA66 /* Icon-72.png in Resources */, 61F7A43911E290650040BA66 /* Icon-Small-50.png in Resources */, @@ -2179,6 +2185,8 @@ 6172FEF21298D25D00D73365 /* smallerBackground~iphone.png in Resources */, 61889985129995B500D55FD6 /* title~ipad.png in Resources */, 6103D414129B417500911D8D /* plus@2x.png in Resources */, + 615FEAE212A2A6640098EE92 /* localplayButton~ipad.png in Resources */, + 615FEAE312A2A6640098EE92 /* localplayButton~iphone.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2717,7 +2725,7 @@ GCC_PREPROCESSOR_DEFINITIONS = DEBUG; GCC_STRICT_ALIASING = YES; GCC_THUMB_SUPPORT = NO; - GCC_VERSION = com.apple.compilers.llvmgcc42; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = (