--- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Fri Feb 10 17:18:49 2012 +0400
+++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Sat Feb 11 04:24:53 2012 +0100
@@ -95,6 +95,7 @@
615E76BE14E4421200FBA131 /* MGSplitViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 615E76BB14E4421200FBA131 /* MGSplitViewController.m */; };
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 */; };
+ 616245D114E6160200CC97FB /* libFreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6162456714E6159C00CC97FB /* libFreetype.a */; };
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 */; };
@@ -198,7 +199,6 @@
61915D5C143A4E2C00299991 /* MissionTrainingViewController-iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61915D5A143A4E2C00299991 /* MissionTrainingViewController-iPhone.xib */; };
6195981F1364BCEF00B429B6 /* libTremor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6195981D1364BCD200B429B6 /* libTremor.a */; };
619599451364C83D00B429B6 /* libLua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 619599441364C82B00B429B6 /* libLua.a */; };
- 619599C01364E66B00B429B6 /* libFreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 619599BF1364E65900B429B6 /* libFreetype.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 */; };
@@ -285,6 +285,13 @@
/* End PBXBuildRule section */
/* Begin PBXContainerItemProxy section */
+ 6162456614E6159C00CC97FB /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 619599BA1364E65900B429B6 /* Freetype.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = D2AAC07E0554694100DB518D /* libFreetype.a */;
+ remoteInfo = libFreetype;
+ };
6195981C1364BCD200B429B6 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 619598181364BCD200B429B6 /* Tremor.xcodeproj */;
@@ -299,13 +306,6 @@
remoteGlobalIDString = D2AAC07E0554694100DB518D;
remoteInfo = libLua;
};
- 619599BE1364E65900B429B6 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 619599BA1364E65900B429B6 /* Freetype.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = D2AAC07E0554694100DB518D;
- remoteInfo = libFreetype;
- };
61A19AE914D2010A004B1E6D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 61A19AE314D2010A004B1E6D /* SDL.xcodeproj */;
@@ -592,7 +592,7 @@
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; };
61798934114AB25F00BA94A9 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
- 61798A5E114AE08600BA94A9 /* Data */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Data; path = ../../../trunk/project_files/HedgewarsMobile/Data; sourceTree = "<group>"; };
+ 61798A5E114AE08600BA94A9 /* Data */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Data; sourceTree = SOURCE_ROOT; };
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>"; };
617BC23A1490211F00E1C294 /* Italian */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Italian; path = Locale/Italian.lproj/Scheme.strings; sourceTree = "<group>"; };
@@ -608,7 +608,7 @@
61915D5A143A4E2C00299991 /* MissionTrainingViewController-iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = "MissionTrainingViewController-iPhone.xib"; sourceTree = "<group>"; };
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; };
- 619599BA1364E65900B429B6 /* Freetype.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Freetype.xcodeproj; path = "../../misc/libfreetype/Xcode-iPhoneOS/Freetype.xcodeproj"; sourceTree = SOURCE_ROOT; };
+ 619599BA1364E65900B429B6 /* Freetype.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Freetype.xcodeproj; path = "../../misc/libfreetype/Xcode-iOS/Freetype.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 = "<group>"; };
@@ -710,7 +710,7 @@
buildActionMask = 2147483647;
files = (
922F64900F10F53100DC6EC0 /* libfpc.a in Frameworks */,
- 619599C01364E66B00B429B6 /* libFreetype.a in Frameworks */,
+ 616245D114E6160200CC97FB /* libFreetype.a in Frameworks */,
619599451364C83D00B429B6 /* libLua.a in Frameworks */,
6195981F1364BCEF00B429B6 /* libTremor.a in Frameworks */,
61A19AFC14D20170004B1E6D /* libSDL.a in Frameworks */,
@@ -909,6 +909,14 @@
name = MGSplitViewController;
sourceTree = "<group>";
};
+ 6162456314E6159C00CC97FB /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ 6162456714E6159C00CC97FB /* libFreetype.a */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
6163EE4C11CC2478001C0453 /* Settings Page */ = {
isa = PBXGroup;
children = (
@@ -1073,14 +1081,6 @@
name = Products;
sourceTree = "<group>";
};
- 619599BB1364E65900B429B6 /* Products */ = {
- isa = PBXGroup;
- children = (
- 619599BF1364E65900B429B6 /* libFreetype.a */,
- );
- name = Products;
- sourceTree = "<group>";
- };
61A19AE414D2010A004B1E6D /* Products */ = {
isa = PBXGroup;
children = (
@@ -1370,7 +1370,7 @@
projectDirPath = "";
projectReferences = (
{
- ProductGroup = 619599BB1364E65900B429B6 /* Products */;
+ ProductGroup = 6162456314E6159C00CC97FB /* Products */;
ProjectRef = 619599BA1364E65900B429B6 /* Freetype.xcodeproj */;
},
{
@@ -1412,6 +1412,13 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
+ 6162456714E6159C00CC97FB /* libFreetype.a */ = {
+ isa = PBXReferenceProxy;
+ fileType = archive.ar;
+ path = libFreetype.a;
+ remoteRef = 6162456614E6159C00CC97FB /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
6195981D1364BCD200B429B6 /* libTremor.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@@ -1426,13 +1433,6 @@
remoteRef = 619599431364C82B00B429B6 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 619599BF1364E65900B429B6 /* libFreetype.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libFreetype.a;
- remoteRef = 619599BE1364E65900B429B6 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
61A19AEA14D2010A004B1E6D /* libSDL.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@@ -1890,7 +1890,6 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
- "\"$(SRCROOT)/../../../Library/SDL/src/events\"",
"\"$(SRCROOT)/../../../Library/SDL/src/video\"/**",
"\"$(SRCROOT)/../../../Library/SDL/include/\"",
"\"$(SRCROOT)/../../../Library/SDL_net/\"",
@@ -1973,7 +1972,6 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
- "\"$(SRCROOT)/../../../Library/SDL/src/events\"",
"\"$(SRCROOT)/../../../Library/SDL/src/video\"/**",
"\"$(SRCROOT)/../../../Library/SDL/include/\"",
"\"$(SRCROOT)/../../../Library/SDL_net/\"",
@@ -2098,7 +2096,6 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
- "\"$(SRCROOT)/../../../Library/SDL/src/events\"",
"\"$(SRCROOT)/../../../Library/SDL/src/video\"/**",
"\"$(SRCROOT)/../../../Library/SDL/include/\"",
"\"$(SRCROOT)/../../../Library/SDL_net/\"",
@@ -2145,7 +2142,6 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
- "\"$(SRCROOT)/../../../Library/SDL/src/events\"",
"\"$(SRCROOT)/../../../Library/SDL/src/video\"/**",
"\"$(SRCROOT)/../../../Library/SDL/include/\"",
"\"$(SRCROOT)/../../../Library/SDL_net/\"",