Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Changes required for Xcode 4 (dropped ppc arch). #102

Open
wants to merge 1 commit into from

2 participants

@nullmedium

I made a few modifications to get Xcode 4 to compile your experimental branch on Mac OSX 10.6.

@astrofrog

II can confirm that this works for me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jun 6, 2011
  1. @nullmedium
This page is out of date. Refresh to see the latest.
Showing with 24 additions and 11 deletions.
  1. +23 −10 GitX.xcodeproj/project.pbxproj
  2. +1 −1  build_libgit2.sh
View
33 GitX.xcodeproj/project.pbxproj
@@ -354,7 +354,7 @@
D8E3B38110DD4E2C001096A3 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PBCreateTagSheet.xib; sourceTree = "<group>"; };
D8EB6168122F643E00FCCAF4 /* GitXRelativeDateFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GitXRelativeDateFormatter.h; sourceTree = "<group>"; };
D8EB6169122F643E00FCCAF4 /* GitXRelativeDateFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GitXRelativeDateFormatter.m; sourceTree = "<group>"; };
- D8F01C4A12182F19007F729F /* GitX.sdef */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.sdef; path = GitX.sdef; sourceTree = "<group>"; };
+ D8F01C4A12182F19007F729F /* GitX.sdef */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = GitX.sdef; sourceTree = "<group>"; };
D8F01D511218A164007F729F /* NSApplication+GitXScripting.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSApplication+GitXScripting.h"; sourceTree = "<group>"; };
D8F01D521218A164007F729F /* NSApplication+GitXScripting.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSApplication+GitXScripting.m"; sourceTree = "<group>"; };
D8F01D841218A406007F729F /* GitX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GitX.h; sourceTree = "<group>"; };
@@ -1580,6 +1580,7 @@
26FC0A860875C7B200E6366F /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -1587,6 +1588,7 @@
);
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_MODEL_TUNING = G5;
+ GCC_OPTIMIZATION_LEVEL = 2;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = GitX_Prefix.pch;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "";
@@ -1612,26 +1614,24 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_PREPROCESS = YES;
+ MACOSX_DEPLOYMENT_TARGET = 10.6;
PREBINDING = NO;
- SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+ SDKROOT = macosx;
};
name = Debug;
};
26FC0A8A0875C7B200E6366F /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- ppc,
- i386,
- x86_64,
- );
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
GCC_ENABLE_OBJC_GC = required;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_PREFIX_HEADER = $PROJECT_TEMP_DIR/revision;
INFOPLIST_PREPROCESS = YES;
+ MACOSX_DEPLOYMENT_TARGET = 10.6;
PREBINDING = NO;
- SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+ SDKROOT = macosx;
};
name = Release;
};
@@ -1655,6 +1655,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = gitx_askpasswd;
+ SDKROOT = macosx10.6;
};
name = Debug;
};
@@ -1677,6 +1678,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = gitx_askpasswd;
+ SDKROOT = macosx10.6;
ZERO_LINK = NO;
};
name = Release;
@@ -1698,6 +1700,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = gitx_askpasswd;
+ SDKROOT = macosx10.6;
};
name = Install;
};
@@ -1721,6 +1724,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = gitx;
+ SDKROOT = macosx10.6;
ZERO_LINK = YES;
};
name = Debug;
@@ -1744,6 +1748,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = gitx;
+ SDKROOT = macosx10.6;
ZERO_LINK = NO;
};
name = Release;
@@ -1761,6 +1766,10 @@
D8022B1611DFCE7F003C21F6 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ i386,
+ x86_64,
+ );
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
@@ -1775,6 +1784,7 @@
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
+ MACOSX_DEPLOYMENT_TARGET = 10.6;
PRODUCT_NAME = "Generate PList Prefix";
};
name = Debug;
@@ -1786,6 +1796,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
INFOPLIST_PREPROCESS = YES;
+ MACOSX_DEPLOYMENT_TARGET = 10.6;
PRODUCT_NAME = "Generate PList Prefix";
ZERO_LINK = NO;
};
@@ -1823,6 +1834,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = GitXTesting;
+ SDKROOT = macosx10.6;
};
name = Debug;
};
@@ -1853,6 +1865,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = GitXTesting;
+ SDKROOT = macosx10.6;
ZERO_LINK = NO;
};
name = Release;
@@ -1882,7 +1895,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = SpeedTest;
- SDKROOT = macosx10.5;
+ SDKROOT = macosx10.6;
};
name = Debug;
};
@@ -1907,7 +1920,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = SpeedTest;
- SDKROOT = iphoneos2.0;
+ SDKROOT = macosx10.6;
ZERO_LINK = NO;
};
name = Release;
View
2  build_libgit2.sh
@@ -17,7 +17,7 @@ buildAction () {
git submodule update
cd libgit2
rm -f libgit2.a
- make CFLAGS="-arch i386 -arch ppc -arch x86_64"
+ make CFLAGS="-arch i386 -arch x86_64"
ranlib libgit2.a
else
echo "error: Not a git repository."
Something went wrong with that request. Please try again.