Skip to content

Commit 06b6885

Browse files
committed
make project buildable with Xcode 8
1 parent 770a374 commit 06b6885

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

Classes/git/PBGitRevList.mm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
#import <ObjectiveGit/ObjectiveGit.h>
1818

19-
#import <ext/stdio_filebuf.h>
2019
#import <iostream>
2120
#import <string>
2221
#import <map>

GitX.xcodeproj/project.pbxproj

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,12 @@
2323
/* Begin PBXBuildFile section */
2424
0A6858C711F7EA8A00AC2BE4 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A6858C611F7EA8A00AC2BE4 /* CoreServices.framework */; };
2525
2682AABB1929140E00271A4D /* GTOID+JavaScript.m in Sources */ = {isa = PBXBuildFile; fileRef = 2682AABA1929140E00271A4D /* GTOID+JavaScript.m */; };
26-
4A0B5BD315FE2DA600ACCB61 /* libssl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A0B5BD215FE2DA600ACCB61 /* libssl.dylib */; };
27-
4A0B5BD515FE2DC900ACCB61 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A0B5BD415FE2DC900ACCB61 /* libcrypto.dylib */; };
2826
4A1F4E6917AFE969004D51E9 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97325FDCFA39411CA2CEA /* Foundation.framework */; };
2927
4A2125A417C0C78A00B5B582 /* NSColor+RGB.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A2125A317C0C78A00B5B582 /* NSColor+RGB.m */; };
3028
4A40159714067B6300DB9C07 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A40159614067B6300DB9C07 /* CoreFoundation.framework */; };
3129
4A40159914067B7A00DB9C07 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A40159814067B7A00DB9C07 /* AppKit.framework */; };
3230
4A467EEE1546D1CD00F8902B /* ObjectiveGit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A4EF0AF142CBAD5001B8CDF /* ObjectiveGit.framework */; };
3331
4A4EF0BB142CBBC2001B8CDF /* ObjectiveGit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A4EF0AF142CBAD5001B8CDF /* ObjectiveGit.framework */; };
34-
4A4EF0BE142CBC59001B8CDF /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A4EF0BD142CBC59001B8CDF /* libz.dylib */; };
3532
4A5D75C114A9A90500DF6C68 /* Credits.html in Resources */ = {isa = PBXBuildFile; fileRef = 4A5D757D14A9A90500DF6C68 /* Credits.html */; };
3633
4A5D75C214A9A90500DF6C68 /* gitx.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4A5D757E14A9A90500DF6C68 /* gitx.icns */; };
3734
4A5D75DE14A9A90500DF6C68 /* mainSplitterBar.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4A5D759B14A9A90500DF6C68 /* mainSplitterBar.tiff */; };
@@ -350,14 +347,11 @@
350347
2682AABA1929140E00271A4D /* GTOID+JavaScript.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTOID+JavaScript.m"; sourceTree = "<group>"; };
351348
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
352349
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
353-
4A0B5BD215FE2DA600ACCB61 /* libssl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.dylib; path = usr/lib/libssl.dylib; sourceTree = SDKROOT; };
354-
4A0B5BD415FE2DC900ACCB61 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; };
355350
4A2125A217C0C78A00B5B582 /* NSColor+RGB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSColor+RGB.h"; sourceTree = "<group>"; };
356351
4A2125A317C0C78A00B5B582 /* NSColor+RGB.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSColor+RGB.m"; sourceTree = "<group>"; };
357352
4A40159614067B6300DB9C07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
358353
4A40159814067B7A00DB9C07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
359354
4A4EF09F142CBAD5001B8CDF /* ObjectiveGitFramework.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ObjectiveGitFramework.xcodeproj; path = "objective-git/ObjectiveGitFramework.xcodeproj"; sourceTree = "<group>"; };
360-
4A4EF0BD142CBC59001B8CDF /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
361355
4A52D2CD1558187800B778A5 /* GitX-dev.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "GitX-dev.html"; path = "updates/GitX-dev.html"; sourceTree = SOURCE_ROOT; };
362356
4A5D757D14A9A90500DF6C68 /* Credits.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = Credits.html; sourceTree = "<group>"; };
363357
4A5D757E14A9A90500DF6C68 /* gitx.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = gitx.icns; sourceTree = "<group>"; };
@@ -642,11 +636,8 @@
642636
isa = PBXFrameworksBuildPhase;
643637
buildActionMask = 2147483647;
644638
files = (
645-
4A0B5BD515FE2DC900ACCB61 /* libcrypto.dylib in Frameworks */,
646-
4A0B5BD315FE2DA600ACCB61 /* libssl.dylib in Frameworks */,
647639
4A8F6B4B14A9B6C20002F4D7 /* MGScopeBar.framework in Frameworks */,
648640
4A68AD7414A00541006DE321 /* Sparkle.framework in Frameworks */,
649-
4A4EF0BE142CBC59001B8CDF /* libz.dylib in Frameworks */,
650641
4A4EF0BB142CBBC2001B8CDF /* ObjectiveGit.framework in Frameworks */,
651642
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
652643
F56526240E03D85900F03B52 /* WebKit.framework in Frameworks */,
@@ -705,9 +696,6 @@
705696
4A40159614067B6300DB9C07 /* CoreFoundation.framework */,
706697
0A6858C611F7EA8A00AC2BE4 /* CoreServices.framework */,
707698
29B97325FDCFA39411CA2CEA /* Foundation.framework */,
708-
4A0B5BD415FE2DC900ACCB61 /* libcrypto.dylib */,
709-
4A0B5BD215FE2DA600ACCB61 /* libssl.dylib */,
710-
4A4EF0BD142CBC59001B8CDF /* libz.dylib */,
711699
D87127001229A21C00012334 /* QuartzCore.framework */,
712700
D8E3B2B710DC9FB2001096A3 /* ScriptingBridge.framework */,
713701
D89E9AB21218A9DA0097A90B /* ScriptingBridge.framework */,
@@ -1683,7 +1671,7 @@
16831671
"$(PROJECT_DIR)/objective-git/External/libgit2/include",
16841672
);
16851673
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
1686-
MACOSX_DEPLOYMENT_TARGET = 10.8;
1674+
MACOSX_DEPLOYMENT_TARGET = 10.9;
16871675
ONLY_ACTIVE_ARCH = YES;
16881676
OTHER_CFLAGS = "-Werror=incompatible-pointer-types";
16891677
RUN_CLANG_STATIC_ANALYZER = YES;
@@ -1708,7 +1696,7 @@
17081696
"$(PROJECT_DIR)/objective-git/External/libgit2/include",
17091697
);
17101698
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
1711-
MACOSX_DEPLOYMENT_TARGET = 10.8;
1699+
MACOSX_DEPLOYMENT_TARGET = 10.9;
17121700
OTHER_CFLAGS = "-Werror=incompatible-pointer-types";
17131701
RUN_CLANG_STATIC_ANALYZER = YES;
17141702
SDKROOT = macosx;

0 commit comments

Comments
 (0)