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

Merge pull request #1049 from syershov/fix-water-boundaries

Browse source 
Fix Xcode project (fonts were corrected in qt app)
This commit is contained in:
Ilya Zverev 2015-12-18 14:28:20 +03:00
commit c1b976e1de
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj
View file

@ -41,7 +41,6 @@
6729A5D31A69316A007D5872 /* unicode_blocks.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5D21A69316A007D5872 /* unicode_blocks.txt */; };
6729A5D61A69319F007D5872 /* fonts_blacklist.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5D41A69319F007D5872 /* fonts_blacklist.txt */; };
6729A5D71A69319F007D5872 /* fonts_whitelist.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5D51A69319F007D5872 /* fonts_whitelist.txt */; };
6729A5DF1A6931CE007D5872 /* 00_roboto_regular.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5D81A6931CD007D5872 /* 00_roboto_regular.ttf */; };
6729A5E01A6931CE007D5872 /* 01_dejavusans.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5D91A6931CD007D5872 /* 01_dejavusans.ttf */; };
6729A5E21A6931CE007D5872 /* 03_jomolhari-id-a3d.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5DB1A6931CD007D5872 /* 03_jomolhari-id-a3d.ttf */; };
6729A5E31A6931CE007D5872 /* 04_padauk.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5DC1A6931CE007D5872 /* 04_padauk.ttf */; };
@ -99,6 +98,7 @@
67534C421A4097D000A0A8C3 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67534C411A4097D000A0A8C3 /* OpenGL.framework */; };
67534D271A40AA4300A0A8C3 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67534D261A40AA4300A0A8C3 /* CoreLocation.framework */; };
677A2DEB1C0DDDBE00635A00 /* resources-default in Resources */ = {isa = PBXBuildFile; fileRef = 677A2DE71C0DDD7C00635A00 /* resources-default */; };
67A461A71C2172C400B18739 /* 00_roboto_medium.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 67A461A61C2172C400B18739 /* 00_roboto_medium.ttf */; };
67E8DC931BBC1D3F0053C5BA /* libagg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67E8DC911BBC1D3F0053C5BA /* libagg.a */; };
67E8DC941BBC1D3F0053C5BA /* liblodepng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67E8DC921BBC1D3F0053C5BA /* liblodepng.a */; };
9D4AD1DD1B7388CD00EBDD27 /* 02_droidsans-fallback.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9DF792621B73884F00AF2D19 /* 02_droidsans-fallback.ttf */; };
@ -136,6 +136,7 @@
dstPath = "";
dstSubfolderSpec = 7;
files = (
67A461A71C2172C400B18739 /* 00_roboto_medium.ttf in CopyFiles */,
6714E5E41BD13F67008AB603 /* drules_proto_clear.bin in CopyFiles */,
6714E5E51BD13F67008AB603 /* drules_proto_clear.txt in CopyFiles */,
6714E5E61BD13F67008AB603 /* drules_proto_dark.bin in CopyFiles */,
@ -148,7 +149,6 @@
6729A66F1A695C70007D5872 /* welcome.html in CopyFiles */,
6729A5E81A69321A007D5872 /* World.mwm in CopyFiles */,
6729A5E91A69321A007D5872 /* WorldCoasts.mwm in CopyFiles */,
6729A5DF1A6931CE007D5872 /* 00_roboto_regular.ttf in CopyFiles */,
6729A5E01A6931CE007D5872 /* 01_dejavusans.ttf in CopyFiles */,
9D4AD1DD1B7388CD00EBDD27 /* 02_droidsans-fallback.ttf in CopyFiles */,
6729A5E21A6931CE007D5872 /* 03_jomolhari-id-a3d.ttf in CopyFiles */,
@ -200,7 +200,6 @@
6729A5D21A69316A007D5872 /* unicode_blocks.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = unicode_blocks.txt; sourceTree = "<group>"; };
6729A5D41A69319F007D5872 /* fonts_blacklist.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = fonts_blacklist.txt; sourceTree = "<group>"; };
6729A5D51A69319F007D5872 /* fonts_whitelist.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = fonts_whitelist.txt; sourceTree = "<group>"; };
6729A5D81A6931CD007D5872 /* 00_roboto_regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = 00_roboto_regular.ttf; sourceTree = "<group>"; };
6729A5D91A6931CD007D5872 /* 01_dejavusans.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = 01_dejavusans.ttf; sourceTree = "<group>"; };
6729A5DB1A6931CD007D5872 /* 03_jomolhari-id-a3d.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "03_jomolhari-id-a3d.ttf"; sourceTree = "<group>"; };
6729A5DC1A6931CE007D5872 /* 04_padauk.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = 04_padauk.ttf; sourceTree = "<group>"; };
@ -276,6 +275,7 @@
67534C411A4097D000A0A8C3 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
67534D261A40AA4300A0A8C3 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
677A2DE71C0DDD7C00635A00 /* resources-default */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-default"; sourceTree = "<group>"; };
67A461A61C2172C400B18739 /* 00_roboto_medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = 00_roboto_medium.ttf; sourceTree = "<group>"; };
67E8DC911BBC1D3F0053C5BA /* libagg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libagg.a; path = "/Volumes/AltHD/mapsme/omim/xcode/agg/../../../omim-xcode-build/Debug/libagg.a"; sourceTree = "<absolute>"; };
67E8DC921BBC1D3F0053C5BA /* liblodepng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblodepng.a; path = "/Volumes/AltHD/mapsme/omim/xcode/lodepng/../../../omim-xcode-build/Debug/liblodepng.a"; sourceTree = "<absolute>"; };
9DF792621B73884F00AF2D19 /* 02_droidsans-fallback.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "02_droidsans-fallback.ttf"; sourceTree = "<group>"; };
@ -398,7 +398,7 @@
6729A66C1A695C70007D5872 /* welcome.html */,
6729A5E61A69321A007D5872 /* World.mwm */,
6729A5E71A69321A007D5872 /* WorldCoasts.mwm */,
6729A5D81A6931CD007D5872 /* 00_roboto_regular.ttf */,
67A461A61C2172C400B18739 /* 00_roboto_medium.ttf */,
6729A5D91A6931CD007D5872 /* 01_dejavusans.ttf */,
9DF792621B73884F00AF2D19 /* 02_droidsans-fallback.ttf */,
6729A5DB1A6931CD007D5872 /* 03_jomolhari-id-a3d.ttf */,