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

[Old map downloader] Fix Xcode projects

Browse source
This commit is contained in:
Sergey Yershov 2016-01-22 13:12:27 +03:00
parent b2376c9415
commit c7b011d3cf
3 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,6 +54,8 @@
6753408C1A3F2A7400A0A8C3 /* world_map_generator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340591A3F2A7400A0A8C3 /* world_map_generator.hpp */; };
6753408D1A3F2A7400A0A8C3 /* osm_element.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753405A1A3F2A7400A0A8C3 /* osm_element.cpp */; };
6753408E1A3F2A7400A0A8C3 /* osm_element.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753405B1A3F2A7400A0A8C3 /* osm_element.hpp */; };
675340931C5231BA002CF0D9 /* search_index_builder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675340911C5231BA002CF0D9 /* search_index_builder.cpp */; };
675340941C5231BA002CF0D9 /* search_index_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340921C5231BA002CF0D9 /* search_index_builder.hpp */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@ -106,6 +108,8 @@
675340591A3F2A7400A0A8C3 /* world_map_generator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = world_map_generator.hpp; sourceTree = "<group>"; };
6753405A1A3F2A7400A0A8C3 /* osm_element.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osm_element.cpp; sourceTree = "<group>"; };
6753405B1A3F2A7400A0A8C3 /* osm_element.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osm_element.hpp; sourceTree = "<group>"; };
675340911C5231BA002CF0D9 /* search_index_builder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_index_builder.cpp; sourceTree = "<group>"; };
675340921C5231BA002CF0D9 /* search_index_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_index_builder.hpp; sourceTree = "<group>"; };
6764B8921ADD6A3300DD8B15 /* osm_o5m_source.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = osm_o5m_source.hpp; sourceTree = "<group>"; };
67F0F6761B8C9DCE003F52FF /* osm_xml_source.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = osm_xml_source.hpp; sourceTree = "<group>"; };
/* End PBXFileReference section */
@ -141,6 +145,8 @@
6753401D1A3F2A1B00A0A8C3 /* generator */ = {
isa = PBXGroup;
children = (
675340911C5231BA002CF0D9 /* search_index_builder.cpp */,
675340921C5231BA002CF0D9 /* search_index_builder.hpp */,
675340291A3F2A7400A0A8C3 /* borders_generator.cpp */,
6753402A1A3F2A7400A0A8C3 /* borders_generator.hpp */,
6753402B1A3F2A7400A0A8C3 /* borders_loader.cpp */,
@ -220,6 +226,7 @@
6753405F1A3F2A7400A0A8C3 /* borders_loader.hpp in Headers */,
675340801A3F2A7400A0A8C3 /* polygonizer.hpp in Headers */,
6753408A1A3F2A7400A0A8C3 /* update_generator.hpp in Headers */,
675340941C5231BA002CF0D9 /* search_index_builder.hpp in Headers */,
675340821A3F2A7400A0A8C3 /* routing_generator.hpp in Headers */,
675340841A3F2A7400A0A8C3 /* statistics.hpp in Headers */,
6753406D1A3F2A7400A0A8C3 /* feature_generator.hpp in Headers */,
@ -297,6 +304,7 @@
675340701A3F2A7400A0A8C3 /* feature_sorter.cpp in Sources */,
675340621A3F2A7400A0A8C3 /* coastlines_generator.cpp in Sources */,
675340811A3F2A7400A0A8C3 /* routing_generator.cpp in Sources */,
675340931C5231BA002CF0D9 /* search_index_builder.cpp in Sources */,
6753406E1A3F2A7400A0A8C3 /* feature_merger.cpp in Sources */,
6753408D1A3F2A7400A0A8C3 /* osm_element.cpp in Sources */,
6726C1D51A4AFEF4005EEA39 /* osm2meta.cpp in Sources */,

16
xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj
View file

@ -42,6 +42,10 @@
674A28F01B1C8104001A525C /* libsearch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28EF1B1C8104001A525C /* libsearch.a */; };
674A28F21B1C8119001A525C /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28F11B1C8119001A525C /* libsuccinct.a */; };
674A28F41B1C8125001A525C /* libosrm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28F31B1C8125001A525C /* libosrm.a */; };
6753408B1C523054002CF0D9 /* libeditor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675340891C523054002CF0D9 /* libeditor.a */; };
6753408C1C523054002CF0D9 /* libpugixml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6753408A1C523054002CF0D9 /* libpugixml.a */; };
6753408E1C5230DE002CF0D9 /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6753408D1C5230DE002CF0D9 /* liboauthcpp.a */; };
675340901C5230ED002CF0D9 /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6753408F1C5230ED002CF0D9 /* libalohalitics.a */; };
675341631A3F54F600A0A8C3 /* generator_tool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675341621A3F54F600A0A8C3 /* generator_tool.cpp */; };
675343E31A3F607600A0A8C3 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 675343E21A3F607600A0A8C3 /* Cocoa.framework */; };
675344431A3F65E800A0A8C3 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 675343E01A3F600D00A0A8C3 /* IOKit.framework */; };
@ -164,6 +168,10 @@
674A28F11B1C8119001A525C /* libsuccinct.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsuccinct.a; path = "../../../omim-xcode-build/Debug/libsuccinct.a"; sourceTree = "<group>"; };
674A28F31B1C8125001A525C /* libosrm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosrm.a; path = "../../../omim-xcode-build/Debug/libosrm.a"; sourceTree = "<group>"; };
674A39D21B727589001DDB91 /* source_to_element_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = source_to_element_test.cpp; sourceTree = "<group>"; };
675340891C523054002CF0D9 /* libeditor.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libeditor.a; path = "/Users/darkserj/mapsme/omim/xcode/editor/../../../omim-xcode-build/Debug/libeditor.a"; sourceTree = "<absolute>"; };
6753408A1C523054002CF0D9 /* libpugixml.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpugixml.a; path = "/Users/darkserj/mapsme/omim/xcode/pugixml/../../../omim-xcode-build/Debug/libpugixml.a"; sourceTree = "<absolute>"; };
6753408D1C5230DE002CF0D9 /* liboauthcpp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liboauthcpp.a; path = "/Users/darkserj/mapsme/omim/xcode/oauthcpp/../../../omim-xcode-build/Debug/liboauthcpp.a"; sourceTree = "<absolute>"; };
6753408F1C5230ED002CF0D9 /* libalohalitics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libalohalitics.a; path = "/Users/darkserj/mapsme/omim/xcode/alohalitics/../../../omim-xcode-build/Debug/libalohalitics.a"; sourceTree = "<absolute>"; };
675341581A3F54D800A0A8C3 /* generator_tool */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = generator_tool; sourceTree = BUILT_PRODUCTS_DIR; };
675341621A3F54F600A0A8C3 /* generator_tool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = generator_tool.cpp; sourceTree = "<group>"; };
675343DE1A3F5FE500A0A8C3 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
@ -206,6 +214,10 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
675340901C5230ED002CF0D9 /* libalohalitics.a in Frameworks */,
6753408E1C5230DE002CF0D9 /* liboauthcpp.a in Frameworks */,
6753408B1C523054002CF0D9 /* libeditor.a in Frameworks */,
6753408C1C523054002CF0D9 /* libpugixml.a in Frameworks */,
6719DD5F1B95AB570018166F /* libtess2.a in Frameworks */,
674A28F41B1C8125001A525C /* libosrm.a in Frameworks */,
674A28F21B1C8119001A525C /* libsuccinct.a in Frameworks */,
@ -319,6 +331,10 @@
6753414F1A3F54D800A0A8C3 = {
isa = PBXGroup;
children = (
6753408F1C5230ED002CF0D9 /* libalohalitics.a */,
6753408D1C5230DE002CF0D9 /* liboauthcpp.a */,
675340891C523054002CF0D9 /* libeditor.a */,
6753408A1C523054002CF0D9 /* libpugixml.a */,
670D05AD1B0E08260013A7AC /* defaults.xcconfig */,
670B84C41A9F73AB00CE4492 /* std */,
6726C1D71A4C27A5005EEA39 /* Tests */,

2
xcode/platform/platform.xcodeproj/project.pbxproj
View file

@ -343,6 +343,7 @@
"ios_*",
platform_ios.mm,
);
FRAMEWORK_SEARCH_PATHS = "";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
@ -399,6 +400,7 @@
"ios_*",
platform_ios.mm,
);
FRAMEWORK_SEARCH_PATHS = "";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;