diff -r f7e49eff3708 -r f9283dc4860d project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj --- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Sun Apr 24 22:57:57 2011 +0200 +++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Sun Apr 24 23:13:45 2011 +0200 @@ -111,7 +111,6 @@ 6165925511CA9CB400D6E256 /* MapConfigViewController-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924D11CA9CB400D6E256 /* MapConfigViewController-iPad.xib */; }; 6165925811CA9CB400D6E256 /* OverlayViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165925011CA9CB400D6E256 /* OverlayViewController.xib */; }; 6165929E11CA9E2F00D6E256 /* HedgewarsAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6165929D11CA9E2F00D6E256 /* HedgewarsAppDelegate.m */; }; - 6172555A12B3DD4A0098D069 /* libLua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6172555912B3DCEE0098D069 /* libLua.a */; }; 6172FED91298CF9800D73365 /* background~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FED71298CF9800D73365 /* background~iphone.png */; }; 6172FEEF1298D25D00D73365 /* mediumBackground~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FEEB1298D25D00D73365 /* mediumBackground~ipad.png */; }; 6172FEF11298D25D00D73365 /* smallerBackground~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FEED1298D25D00D73365 /* smallerBackground~ipad.png */; }; @@ -157,6 +156,7 @@ 6187AEBD120781B900B31A27 /* Settings in Resources */ = {isa = PBXBuildFile; fileRef = 6187AEA5120781B900B31A27 /* Settings */; }; 61889985129995B500D55FD6 /* title~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 61889984129995B500D55FD6 /* title~ipad.png */; }; 6195981F1364BCEF00B429B6 /* libTremor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6195981D1364BCD200B429B6 /* libTremor.a */; }; + 619599451364C83D00B429B6 /* libLua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 619599441364C82B00B429B6 /* libLua.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 */; }; @@ -243,27 +243,6 @@ remoteGlobalIDString = D2AAC07E0554694100DB518D; remoteInfo = freetype; }; - 6172555412B3DCEE0098D069 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 6172554E12B3DCEE0098D069 /* Lua.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1D6058910D05DD3D006BFB54; - remoteInfo = "Test Lua"; - }; - 6172555612B3DCEE0098D069 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 6172554E12B3DCEE0098D069 /* Lua.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 506EE05E10304ED200A389B3; - remoteInfo = "cocos2d libraries"; - }; - 6172555812B3DCEE0098D069 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 6172554E12B3DCEE0098D069 /* Lua.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = E14CF7C110ABC177005470B6; - remoteInfo = Lua; - }; 6195981C1364BCD200B429B6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 619598181364BCD200B429B6 /* Tremor.xcodeproj */; @@ -271,6 +250,13 @@ remoteGlobalIDString = D2AAC07E0554694100DB518D /* libTremor.a */; remoteInfo = libTremor; }; + 619599431364C82B00B429B6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6195993F1364C82B00B429B6 /* Lua.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = D2AAC07E0554694100DB518D /* libLua.a */; + remoteInfo = libLua; + }; 61B7A54D12FA129F0051E14E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 617988D3114AAA3900BA94A9 /* SDLiPhoneOS.xcodeproj */; @@ -440,7 +426,6 @@ 6165925011CA9CB400D6E256 /* OverlayViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = OverlayViewController.xib; path = Resources/OverlayViewController.xib; sourceTree = SOURCE_ROOT; }; 6165929C11CA9E2F00D6E256 /* HedgewarsAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HedgewarsAppDelegate.h; path = Classes/HedgewarsAppDelegate.h; sourceTree = ""; }; 6165929D11CA9E2F00D6E256 /* HedgewarsAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HedgewarsAppDelegate.m; path = Classes/HedgewarsAppDelegate.m; sourceTree = ""; }; - 6172554E12B3DCEE0098D069 /* Lua.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Lua.xcodeproj; path = ../../../Library/Lua/Lua.xcodeproj; sourceTree = SOURCE_ROOT; }; 6172FEA21298C7F900D73365 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "Resources/Icons/Default@2x.png"; sourceTree = ""; }; 6172FEC81298CE4800D73365 /* savesButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "savesButton@2x.png"; path = "Resources/Frontend/savesButton@2x.png"; sourceTree = ""; }; 6172FECA1298CE4E00D73365 /* settingsButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "settingsButton@2x.png"; path = "Resources/Frontend/settingsButton@2x.png"; sourceTree = ""; }; @@ -504,6 +489,7 @@ 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_net/Xcode-iPhoneOS/SDL_net.xcodeproj"; sourceTree = SOURCE_ROOT; }; 619598181364BCD200B429B6 /* Tremor.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Tremor.xcodeproj; path = ../../misc/libtremor/Xcode/Tremor.xcodeproj; sourceTree = SOURCE_ROOT; }; + 6195993F1364C82B00B429B6 /* Lua.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Lua.xcodeproj; path = ../../misc/liblua/Xcode/Lua.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 = ""; }; @@ -581,8 +567,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 619599451364C83D00B429B6 /* libLua.a in Frameworks */, 6195981F1364BCEF00B429B6 /* libTremor.a in Frameworks */, - 6172555A12B3DD4A0098D069 /* libLua.a in Frameworks */, 922F64900F10F53100DC6EC0 /* libfpc.a in Frameworks */, 611E0E5111FA92170077A41E /* libfreetype.a in Frameworks */, 61B7A61512FA13B00051E14E /* libSDL.a in Frameworks */, @@ -701,8 +687,8 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( + 6195993F1364C82B00B429B6 /* Lua.xcodeproj */, 619598181364BCD200B429B6 /* Tremor.xcodeproj */, - 6172554E12B3DCEE0098D069 /* Lua.xcodeproj */, 611E0E4B11FA92130077A41E /* freetype.xcodeproj */, 617988D3114AAA3900BA94A9 /* SDLiPhoneOS.xcodeproj */, 6127232E117DF752005B90CF /* SDL_image.xcodeproj */, @@ -846,16 +832,6 @@ name = Overlay; sourceTree = ""; }; - 6172554F12B3DCEE0098D069 /* Products */ = { - isa = PBXGroup; - children = ( - 6172555512B3DCEE0098D069 /* Lua.app */, - 6172555712B3DCEE0098D069 /* libcocos2d libraries.a */, - 6172555912B3DCEE0098D069 /* libLua.a */, - ); - name = Products; - sourceTree = ""; - }; 61798892114AA56300BA94A9 /* inc */ = { isa = PBXGroup; children = ( @@ -901,6 +877,14 @@ name = Products; sourceTree = ""; }; + 619599401364C82B00B429B6 /* Products */ = { + isa = PBXGroup; + children = ( + 619599441364C82B00B429B6 /* libLua.a */, + ); + name = Products; + sourceTree = ""; + }; 61B7A54712FA129F0051E14E /* Products */ = { isa = PBXGroup; children = ( @@ -1138,8 +1122,8 @@ ProjectRef = 611E0E4B11FA92130077A41E /* freetype.xcodeproj */; }, { - ProductGroup = 6172554F12B3DCEE0098D069 /* Products */; - ProjectRef = 6172554E12B3DCEE0098D069 /* Lua.xcodeproj */; + ProductGroup = 619599401364C82B00B429B6 /* Products */; + ProjectRef = 6195993F1364C82B00B429B6 /* Lua.xcodeproj */; }, { ProductGroup = 61B7A55412FA12AD0051E14E /* Products */; @@ -1183,27 +1167,6 @@ remoteRef = 611E0E4F11FA92130077A41E /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 6172555512B3DCEE0098D069 /* Lua.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = Lua.app; - remoteRef = 6172555412B3DCEE0098D069 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 6172555712B3DCEE0098D069 /* libcocos2d libraries.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocos2d libraries.a"; - remoteRef = 6172555612B3DCEE0098D069 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 6172555912B3DCEE0098D069 /* libLua.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libLua.a; - remoteRef = 6172555812B3DCEE0098D069 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 6195981D1364BCD200B429B6 /* libTremor.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1211,6 +1174,13 @@ remoteRef = 6195981C1364BCD200B429B6 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 619599441364C82B00B429B6 /* libLua.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libLua.a; + remoteRef = 619599431364C82B00B429B6 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 61B7A54E12FA129F0051E14E /* libSDL.a */ = { isa = PBXReferenceProxy; fileType = archive.ar;