Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
wants to merge 1 commit into
base: experimental
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 23 additions & 10 deletions GitX.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>"; };
Expand Down Expand Up @@ -1580,13 +1580,15 @@
26FC0A860875C7B200E6366F /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)\"",
);
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 = "";
Expand All @@ -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;
};
Expand All @@ -1655,6 +1655,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = gitx_askpasswd;
SDKROOT = macosx10.6;
};
name = Debug;
};
Expand All @@ -1677,6 +1678,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = gitx_askpasswd;
SDKROOT = macosx10.6;
ZERO_LINK = NO;
};
name = Release;
Expand All @@ -1698,6 +1700,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = gitx_askpasswd;
SDKROOT = macosx10.6;
};
name = Install;
};
Expand All @@ -1721,6 +1724,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = gitx;
SDKROOT = macosx10.6;
ZERO_LINK = YES;
};
name = Debug;
Expand All @@ -1744,6 +1748,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = gitx;
SDKROOT = macosx10.6;
ZERO_LINK = NO;
};
name = Release;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
};
Expand Down Expand Up @@ -1823,6 +1834,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = GitXTesting;
SDKROOT = macosx10.6;
};
name = Debug;
};
Expand Down Expand Up @@ -1853,6 +1865,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = GitXTesting;
SDKROOT = macosx10.6;
ZERO_LINK = NO;
};
name = Release;
Expand Down Expand Up @@ -1882,7 +1895,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = SpeedTest;
SDKROOT = macosx10.5;
SDKROOT = macosx10.6;
};
name = Debug;
};
Expand All @@ -1907,7 +1920,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = SpeedTest;
SDKROOT = iphoneos2.0;
SDKROOT = macosx10.6;
ZERO_LINK = NO;
};
name = Release;
Expand Down
2 changes: 1 addition & 1 deletion build_libgit2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down