gdrive-base.diff 2.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778
  1. Index: GTL.xcodeproj/project.pbxproj
  2. ===================================================================
  3. --- GTL.xcodeproj/project.pbxproj (revision 457)
  4. +++ GTL.xcodeproj/project.pbxproj (working copy)
  5. @@ -1048,7 +1048,6 @@
  6. SDKROOT = macosx;
  7. WARNING_CFLAGS = (
  8. "-Wall",
  9. - "-Werror",
  10. "-Wendif-labels",
  11. "-Wnewline-eof",
  12. "-Wfloat-equal",
  13. @@ -1084,7 +1083,6 @@
  14. SDKROOT = macosx;
  15. WARNING_CFLAGS = (
  16. "-Wall",
  17. - "-Werror",
  18. "-Wendif-labels",
  19. "-Wnewline-eof",
  20. "-Wfloat-equal",
  21. @@ -1178,26 +1176,36 @@
  22. 4F1C6E101027B3CF00B46459 /* Debug */ = {
  23. isa = XCBuildConfiguration;
  24. buildSettings = {
  25. - ARCHS = "$(ARCHS_STANDARD)";
  26. + ARCHS = (
  27. + "$(ARCHS_STANDARD)",
  28. + armv7s,
  29. + );
  30. + IPHONEOS_DEPLOYMENT_TARGET = 7.0;
  31. OTHER_CFLAGS = (
  32. "$(inherited)",
  33. "-DGTL_IPHONE=1",
  34. );
  35. PRODUCT_NAME = GTLTouchStaticLib;
  36. SDKROOT = iphoneos;
  37. + SKIP_INSTALL = YES;
  38. };
  39. name = Debug;
  40. };
  41. 4F1C6E111027B3CF00B46459 /* Release */ = {
  42. isa = XCBuildConfiguration;
  43. buildSettings = {
  44. - ARCHS = "$(ARCHS_STANDARD)";
  45. + ARCHS = (
  46. + "$(ARCHS_STANDARD)",
  47. + armv7s,
  48. + );
  49. + IPHONEOS_DEPLOYMENT_TARGET = 7.0;
  50. OTHER_CFLAGS = (
  51. "$(inherited)",
  52. "-DGTL_IPHONE=1",
  53. );
  54. PRODUCT_NAME = GTLTouchStaticLib;
  55. SDKROOT = iphoneos;
  56. + SKIP_INSTALL = YES;
  57. };
  58. name = Release;
  59. };
  60. Index: Objects/GTLService.h
  61. ===================================================================
  62. --- Objects/GTLService.h (revision 457)
  63. +++ Objects/GTLService.h (working copy)
  64. @@ -30,13 +30,6 @@
  65. // GTMSessionFetcher rather than the older GTMHTTPFetcher. The session
  66. // fetcher requires iOS 7/OS X 10.9 and supports out-of-process uploads.
  67. -#if (!TARGET_OS_IPHONE && defined(MAC_OS_X_VERSION_10_11) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_11) \
  68. - || (TARGET_OS_IPHONE && defined(__IPHONE_9_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0)
  69. - #ifndef GTM_USE_SESSION_FETCHER
  70. - #define GTM_USE_SESSION_FETCHER 1
  71. - #endif
  72. -#endif
  73. -
  74. #if !defined(GTL_USE_SESSION_FETCHER) && defined(GTM_USE_SESSION_FETCHER)
  75. #define GTL_USE_SESSION_FETCHER GTM_USE_SESSION_FETCHER
  76. #endif // GTL_USE_SESSION_FETCHER