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

Fix Xcode projects

Browse source
This commit is contained in:
Sergey Yershov 2015-10-19 14:04:06 +03:00 • committed by Sergey Yershov
parent bc070261af
commit fc50599fbc
7 changed files with 65 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -173,12 +173,12 @@
/* Begin PBXFileReference section */
670D05BC1B0E10640013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = "<group>"; };
6714E5DE1BD13F67008AB603 /* drules_proto_clear.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_clear.bin; path = ../../data/drules_proto_clear.bin; sourceTree = "<group>"; };
6714E5DF1BD13F67008AB603 /* drules_proto_clear.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = drules_proto_clear.txt; path = ../../data/drules_proto_clear.txt; sourceTree = "<group>"; };
6714E5E01BD13F67008AB603 /* drules_proto_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_dark.bin; path = ../../data/drules_proto_dark.bin; sourceTree = "<group>"; };
6714E5E11BD13F67008AB603 /* drules_proto_dark.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = drules_proto_dark.txt; path = ../../data/drules_proto_dark.txt; sourceTree = "<group>"; };
6714E5E21BD13F67008AB603 /* drules_proto-bw.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = "drules_proto-bw.bin"; path = "../../data/drules_proto-bw.bin"; sourceTree = "<group>"; };
6714E5E31BD13F67008AB603 /* drules_proto-bw.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = "drules_proto-bw.txt"; path = "../../data/drules_proto-bw.txt"; sourceTree = "<group>"; };
6714E5DE1BD13F67008AB603 /* drules_proto_clear.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = drules_proto_clear.bin; sourceTree = "<group>"; };
6714E5DF1BD13F67008AB603 /* drules_proto_clear.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = drules_proto_clear.txt; sourceTree = "<group>"; };
6714E5E01BD13F67008AB603 /* drules_proto_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = drules_proto_dark.bin; sourceTree = "<group>"; };
6714E5E11BD13F67008AB603 /* drules_proto_dark.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = drules_proto_dark.txt; sourceTree = "<group>"; };
6714E5E21BD13F67008AB603 /* drules_proto-bw.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = "drules_proto-bw.bin"; sourceTree = "<group>"; };
6714E5E31BD13F67008AB603 /* drules_proto-bw.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "drules_proto-bw.txt"; sourceTree = "<group>"; };
6714E6001BD14016008AB603 /* resources-mdpi_clear */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-mdpi_clear"; sourceTree = "<group>"; };
6714E6011BD14016008AB603 /* resources-mdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-mdpi_dark"; sourceTree = "<group>"; };
671F59011B8755FE0032311E /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
@ -326,6 +326,8 @@
6729A4591A684401007D5872 /* Libs */ = {
isa = PBXGroup;
children = (
67E8DC911BBC1D3F0053C5BA /* libagg.a */,
67E8DC921BBC1D3F0053C5BA /* liblodepng.a */,
671F592F1B8759460032311E /* libminizip.a */,
671F59011B8755FE0032311E /* libz.dylib */,
674A29901B26F0AE001A525C /* libalohalitics.a */,
@ -367,6 +369,12 @@
6729A5C91A693045007D5872 /* Resources */ = {
isa = PBXGroup;
children = (
6714E5DE1BD13F67008AB603 /* drules_proto_clear.bin */,
6714E5DF1BD13F67008AB603 /* drules_proto_clear.txt */,
6714E5E01BD13F67008AB603 /* drules_proto_dark.bin */,
6714E5E11BD13F67008AB603 /* drules_proto_dark.txt */,
6714E5E21BD13F67008AB603 /* drules_proto-bw.bin */,
6714E5E31BD13F67008AB603 /* drules_proto-bw.txt */,
6729A6701A695CA8007D5872 /* languages.txt */,
6729A66A1A695C70007D5872 /* copyright.html */,
6729A66B1A695C70007D5872 /* eula.html */,
@ -404,14 +412,6 @@
675345401A404C6100A0A8C3 = {
isa = PBXGroup;
children = (
6714E5DE1BD13F67008AB603 /* drules_proto_clear.bin */,
6714E5DF1BD13F67008AB603 /* drules_proto_clear.txt */,
6714E5E01BD13F67008AB603 /* drules_proto_dark.bin */,
6714E5E11BD13F67008AB603 /* drules_proto_dark.txt */,
6714E5E21BD13F67008AB603 /* drules_proto-bw.bin */,
6714E5E31BD13F67008AB603 /* drules_proto-bw.txt */,
67E8DC911BBC1D3F0053C5BA /* libagg.a */,
67E8DC921BBC1D3F0053C5BA /* liblodepng.a */,
670D05BC1B0E10640013A7AC /* defaults.xcconfig */,
6729A5C91A693045007D5872 /* Resources */,
6729A4591A684401007D5872 /* Libs */,

3
xcode/agg/agg.xcodeproj/project.pbxproj
View file

@ -683,6 +683,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
WARNING_CFLAGS = "-Wno-deprecated-register";
};
name = Debug;
};
@ -720,6 +721,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
WARNING_CFLAGS = "-Wno-deprecated-register";
};
name = Release;
};
@ -758,6 +760,7 @@
67E8DB8A1BBC19810053C5BA /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};

3
xcode/freetype/freetype.xcodeproj/project.pbxproj
View file

@ -1688,7 +1688,7 @@
6753484A1A408D9300A0A8C3 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0640;
LastUpgradeCheck = 0700;
ORGANIZATIONNAME = maps.me;
TargetAttributes = {
675348511A408D9300A0A8C3 = {
@ -1942,6 +1942,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
FT2_BUILD_LIBRARY = 1;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;

3
xcode/gflags/gflags.xcodeproj/project.pbxproj
View file

@ -98,7 +98,7 @@
675344251A3F64E400A0A8C3 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0630;
LastUpgradeCheck = 0700;
ORGANIZATIONNAME = maps.me;
TargetAttributes = {
6753442C1A3F64E400A0A8C3 = {
@ -158,6 +158,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;

3
xcode/jansson/jansson.xcodeproj/project.pbxproj
View file

@ -159,7 +159,7 @@
675344451A3F664300A0A8C3 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0630;
LastUpgradeCheck = 0700;
ORGANIZATIONNAME = maps.me;
TargetAttributes = {
6753444C1A3F664300A0A8C3 = {
@ -226,6 +226,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;

48
xcode/map/map.xcodeproj/project.pbxproj
View file

@ -32,7 +32,6 @@
674A2A251B26FE62001A525C /* libstorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A2A091B26FE62001A525C /* libstorage.a */; };
674A2A261B26FE62001A525C /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A2A0A1B26FE62001A525C /* libsuccinct.a */; };
674A2A271B26FE62001A525C /* libtomcrypt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A2A0B1B26FE62001A525C /* libtomcrypt.a */; };
674A2A281B26FE62001A525C /* libzlib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A2A0C1B26FE62001A525C /* libzlib.a */; };
674A2A2A1B26FF24001A525C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A2A291B26FF24001A525C /* CoreFoundation.framework */; };
674A2A2C1B26FF38001A525C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A2A2B1B26FF38001A525C /* IOKit.framework */; };
674A2A2E1B26FF4F001A525C /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A2A2D1B26FF4F001A525C /* Cocoa.framework */; };
@ -100,6 +99,18 @@
675346A01A4054E800A0A8C3 /* user_mark_dl_cache.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346311A4054E800A0A8C3 /* user_mark_dl_cache.hpp */; };
675346A21A4054E800A0A8C3 /* user_mark.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346331A4054E800A0A8C3 /* user_mark.hpp */; };
67A2526C1BB42E4B0063F8A8 /* qgl_render_context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753460E1A4054E800A0A8C3 /* qgl_render_context.cpp */; settings = {ASSET_TAGS = (); }; };
67F183751BD5041700AB1840 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 67F183741BD5041700AB1840 /* libz.tbd */; };
67F183761BD5045700AB1840 /* bookmarks_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A29CB1B26FCFE001A525C /* bookmarks_test.cpp */; };
67F183771BD5045700AB1840 /* ge0_parser_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A29CC1B26FCFE001A525C /* ge0_parser_tests.cpp */; };
67F183781BD5045700AB1840 /* geourl_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A29CD1B26FCFE001A525C /* geourl_test.cpp */; };
67F183791BD5045700AB1840 /* kmz_unarchive_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A29CE1B26FCFE001A525C /* kmz_unarchive_test.cpp */; };
67F1837A1BD5045700AB1840 /* mwm_url_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A29CF1B26FCFE001A525C /* mwm_url_tests.cpp */; };
67F1837B1BD5045700AB1840 /* navigator_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A29D01B26FCFE001A525C /* navigator_test.cpp */; };
67F183811BD5049500AB1840 /* libagg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67F1837D1BD5049500AB1840 /* libagg.a */; };
67F183821BD5049500AB1840 /* liblodepng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67F1837E1BD5049500AB1840 /* liblodepng.a */; };
67F183831BD5049500AB1840 /* libminizip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67F1837F1BD5049500AB1840 /* libminizip.a */; };
67F183841BD5049500AB1840 /* libtess2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67F183801BD5049500AB1840 /* libtess2.a */; };
67F183881BD5050900AB1840 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67F183871BD5050900AB1840 /* SystemConfiguration.framework */; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
@ -122,7 +133,6 @@
674A29CE1B26FCFE001A525C /* kmz_unarchive_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kmz_unarchive_test.cpp; sourceTree = "<group>"; };
674A29CF1B26FCFE001A525C /* mwm_url_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_url_tests.cpp; sourceTree = "<group>"; };
674A29D01B26FCFE001A525C /* navigator_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = navigator_test.cpp; sourceTree = "<group>"; };
674A29D21B26FCFE001A525C /* tracks_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tracks_tests.cpp; sourceTree = "<group>"; };
674A29DF1B26FD1C001A525C /* map_tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = map_tests; sourceTree = BUILT_PRODUCTS_DIR; };
674A29EE1B26FD5F001A525C /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = "<group>"; };
674A29F11B26FE62001A525C /* libalohalitics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libalohalitics.a; path = "../../../omim-xcode-build/Debug/libalohalitics.a"; sourceTree = "<group>"; };
@ -222,6 +232,13 @@
67D1C8051AE50EEE00A239E3 /* navigator_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = navigator_utils.hpp; sourceTree = "<group>"; };
67D1C8061AE50EEE00A239E3 /* route_track.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = route_track.cpp; sourceTree = "<group>"; };
67D1C8071AE50EEF00A239E3 /* route_track.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = route_track.hpp; sourceTree = "<group>"; };
67F183741BD5041700AB1840 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
67F1837D1BD5049500AB1840 /* libagg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libagg.a; path = "../../../omim-xcode-build/Debug/libagg.a"; sourceTree = "<group>"; };
67F1837E1BD5049500AB1840 /* liblodepng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblodepng.a; path = "../../../omim-xcode-build/Debug/liblodepng.a"; sourceTree = "<group>"; };
67F1837F1BD5049500AB1840 /* libminizip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libminizip.a; path = "../../../omim-xcode-build/Debug/libminizip.a"; sourceTree = "<group>"; };
67F183801BD5049500AB1840 /* libtess2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtess2.a; path = "/Volumes/AltHD/mapsme/omim/xcode/tess2/../../../omim-xcode-build/Debug/libtess2.a"; sourceTree = "<absolute>"; };
67F183851BD504ED00AB1840 /* libsystem_configuration.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsystem_configuration.tbd; path = usr/lib/system/libsystem_configuration.tbd; sourceTree = SDKROOT; };
67F183871BD5050900AB1840 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -229,6 +246,12 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
67F183881BD5050900AB1840 /* SystemConfiguration.framework in Frameworks */,
67F183811BD5049500AB1840 /* libagg.a in Frameworks */,
67F183821BD5049500AB1840 /* liblodepng.a in Frameworks */,
67F183831BD5049500AB1840 /* libminizip.a in Frameworks */,
67F183841BD5049500AB1840 /* libtess2.a in Frameworks */,
67F183751BD5041700AB1840 /* libz.tbd in Frameworks */,
674A2A331B26FFE9001A525C /* OpenGL.framework in Frameworks */,
674A2A311B26FFB5001A525C /* libgui.a in Frameworks */,
674A2A301B26FFA6001A525C /* libgraphics.a in Frameworks */,
@ -258,7 +281,6 @@
674A2A251B26FE62001A525C /* libstorage.a in Frameworks */,
674A2A261B26FE62001A525C /* libsuccinct.a in Frameworks */,
674A2A271B26FE62001A525C /* libtomcrypt.a in Frameworks */,
674A2A281B26FE62001A525C /* libzlib.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -282,7 +304,6 @@
674A29CE1B26FCFE001A525C /* kmz_unarchive_test.cpp */,
674A29CF1B26FCFE001A525C /* mwm_url_tests.cpp */,
674A29D01B26FCFE001A525C /* navigator_test.cpp */,
674A29D21B26FCFE001A525C /* tracks_tests.cpp */,
674A2A351B27011A001A525C /* working_time_tests.cpp */,
);
name = map_tests;
@ -331,6 +352,13 @@
675345B21A4054AD00A0A8C3 = {
isa = PBXGroup;
children = (
67F183871BD5050900AB1840 /* SystemConfiguration.framework */,
67F183851BD504ED00AB1840 /* libsystem_configuration.tbd */,
67F1837D1BD5049500AB1840 /* libagg.a */,
67F1837E1BD5049500AB1840 /* liblodepng.a */,
67F1837F1BD5049500AB1840 /* libminizip.a */,
67F183801BD5049500AB1840 /* libtess2.a */,
67F183741BD5041700AB1840 /* libz.tbd */,
670D05A41B0DF4250013A7AC /* defaults.xcconfig */,
674A2A341B2700B2001A525C /* libs */,
675345BD1A4054AD00A0A8C3 /* map */,
@ -537,6 +565,12 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
67F183761BD5045700AB1840 /* bookmarks_test.cpp in Sources */,
67F183771BD5045700AB1840 /* ge0_parser_tests.cpp in Sources */,
67F183781BD5045700AB1840 /* geourl_test.cpp in Sources */,
67F183791BD5045700AB1840 /* kmz_unarchive_test.cpp in Sources */,
67F1837A1BD5045700AB1840 /* mwm_url_tests.cpp in Sources */,
67F1837B1BD5045700AB1840 /* navigator_test.cpp in Sources */,
674A29F01B26FD6F001A525C /* testingmain.cpp in Sources */,
674A2A361B27011A001A525C /* working_time_tests.cpp in Sources */,
);
@ -594,8 +628,7 @@
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"/Volumes/AltHD/omim-xcode-build/Debug",
"/Volumes/AltHD/omim/xcode/sgitess/../../../omim-xcode-build/Debug",
"$(SDKROOT)/usr/lib/system",
);
OTHER_LDFLAGS = (
"-framework",
@ -621,8 +654,7 @@
GCC_NO_COMMON_BLOCKS = YES;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"/Volumes/AltHD/omim-xcode-build/Debug",
"/Volumes/AltHD/omim/xcode/sgitess/../../../omim-xcode-build/Debug",
"$(SDKROOT)/usr/lib/system",
);
OTHER_LDFLAGS = (
"-framework",

3
xcode/tomcrypt/tomcrypt.xcodeproj/project.pbxproj
View file

@ -98,7 +98,7 @@
675344E21A3F693B00A0A8C3 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0630;
LastUpgradeCheck = 0700;
ORGANIZATIONNAME = maps.me;
TargetAttributes = {
675344E91A3F693B00A0A8C3 = {
@ -158,6 +158,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;