AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] Compilation fixes

Browse source
This commit is contained in:
Alex Zolotarev 2011-06-07 01:32:04 +02:00 • committed by Alex Zolotarev
parent c68213d9a2
commit 34365e4e2c
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -83,6 +83,8 @@
FA500588128907F0002961F0 /* visibility.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA500587128907F0002961F0 /* visibility.txt */; };
FA87151B12B1518F00592DAF /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA87151A12B1518F00592DAF /* SystemConfiguration.framework */; };
FA8F8938132D5DB00048E3FE /* libtomcrypt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8F8937132D5DB00048E3FE /* libtomcrypt.a */; };
FAAFD697139D9BE2000AE70C /* categories.txt in Resources */ = {isa = PBXBuildFile; fileRef = FAAFD696139D9BE2000AE70C /* categories.txt */; };
FAAFD699139D9C6B000AE70C /* libsearch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAAFD698139D9C6B000AE70C /* libsearch.a */; };
FAF37EFF126DCE6F005EA154 /* IPhoneDownload.mm in Sources */ = {isa = PBXBuildFile; fileRef = FAF37EFA126DCE6F005EA154 /* IPhoneDownload.mm */; };
FAF37F00126DCE6F005EA154 /* IPhoneDownloadManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = FAF37EFB126DCE6F005EA154 /* IPhoneDownloadManager.mm */; };
FAF37F01126DCE6F005EA154 /* IPhonePlatform.mm in Sources */ = {isa = PBXBuildFile; fileRef = FAF37EFD126DCE6F005EA154 /* IPhonePlatform.mm */; };
@ -186,6 +188,8 @@
FA87151A12B1518F00592DAF /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
FA8F8937132D5DB00048E3FE /* libtomcrypt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libtomcrypt.a; sourceTree = SOURCE_ROOT; };
FAAE8D5D1338FF8B003ECAD5 /* GetActiveConnectionType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GetActiveConnectionType.h; sourceTree = "<group>"; };
FAAFD696139D9BE2000AE70C /* categories.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = categories.txt; path = ../../data/categories.txt; sourceTree = SOURCE_ROOT; };
FAAFD698139D9C6B000AE70C /* libsearch.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsearch.a; path = libsearch.a; sourceTree = SOURCE_ROOT; };
FAF37EFA126DCE6F005EA154 /* IPhoneDownload.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; name = IPhoneDownload.mm; path = Platform/IPhoneDownload.mm; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
FAF37EFB126DCE6F005EA154 /* IPhoneDownloadManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; name = IPhoneDownloadManager.mm; path = Platform/IPhoneDownloadManager.mm; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
FAF37EFD126DCE6F005EA154 /* IPhonePlatform.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; name = IPhonePlatform.mm; path = Platform/IPhonePlatform.mm; sourceTree = SOURCE_ROOT; };
@ -223,6 +227,7 @@
49DE1CA413437D7A00A93417 /* libbzip2.a in Frameworks */,
49DE1CA513437D7A00A93417 /* libwords.a in Frameworks */,
FA2EF9C713630C3B00E3E484 /* libplatform.a in Frameworks */,
FAAFD699139D9C6B000AE70C /* libsearch.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -358,6 +363,7 @@
FA065FC61286143F00FEA989 /* External Resources */ = {
isa = PBXGroup;
children = (
FAAFD696139D9BE2000AE70C /* categories.txt */,
FA0E845D138554CF008CEABB /* languages.txt */,
EEA615E5134C4968003A9827 /* 01_dejavusans.ttf */,
EEA615E6134C4968003A9827 /* 02_wqy-microhei.ttf */,
@ -398,6 +404,7 @@
FA1DE68411E15D4E00C6D69A /* Static Libraries */ = {
isa = PBXGroup;
children = (
FAAFD698139D9C6B000AE70C /* libsearch.a */,
FA2EF9C613630C3B00E3E484 /* libplatform.a */,
49DE1CA213437D7A00A93417 /* libbzip2.a */,
49DE1CA313437D7A00A93417 /* libwords.a */,
@ -546,6 +553,7 @@
EEA61605134C496A003A9827 /* 05_khmeros.ttf in Resources */,
EE164811135CEE4A003B8A3E /* 06_code2000.ttf in Resources */,
FA0E845E138554CF008CEABB /* languages.txt in Resources */,
FAAFD697139D9BE2000AE70C /* categories.txt in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

2
iphone/Maps/Platform/IPhonePlatform.mm
View file

@ -98,7 +98,7 @@ string IPhonePlatform::ReadPathForFile(char const * file) const
return path;
}
virtual string IPhonePlatform::ResourcesDir() const
string IPhonePlatform::ResourcesDir() const
{
return m_resourcesPath;
}

2
platform/ios_concurrent_runner.mm
View file

@ -47,7 +47,7 @@ namespace threads
scoped_ptr<BoostExceptionFixer> scopedThis;
UNUSED_VALUE(scopedThis);
IRunner<RunnerFuncT>::CallAndCatchAll(f);
IRunner::CallAndCatchAll(m_f);
}
};