Skip to content

Xcode 4 and Lion compile support #108

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: experimental
Choose a base branch
from
Open

Xcode 4 and Lion compile support #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 42 additions & 3 deletions GitX.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
F56439F60F792B2100A579C2 /* ShellScript */,
);
dependencies = (
AAC6960214F6D0F700501E30 /* PBXTargetDependency */,
);
name = "Generate PList Prefix";
productName = "Generate PList Prefix";
Expand Down Expand Up @@ -215,6 +216,20 @@
remoteGlobalIDString = 913D5E480E55644600CECEA2;
remoteInfo = "cli tool";
};
AAC695FF14F6D05B00501E30 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
remoteGlobalIDString = 913D5E480E55644600CECEA2;
remoteInfo = "cli tool";
};
AAC6960114F6D0F700501E30 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
remoteGlobalIDString = 913D5E480E55644600CECEA2;
remoteInfo = "cli tool";
};
D8022C1911DFE8ED003C21F6 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
Expand Down Expand Up @@ -1052,6 +1067,7 @@
);
buildToolPath = /bin/sh;
dependencies = (
AAC6960014F6D05B00501E30 /* PBXTargetDependency */,
);
name = libgit2;
passBuildSettingsInEnvironment = 1;
Expand Down Expand Up @@ -1090,8 +1106,8 @@
buildRules = (
);
dependencies = (
551BF175112F3F3500265053 /* PBXTargetDependency */,
913D5E5A0E5564F400CECEA2 /* PBXTargetDependency */,
551BF175112F3F3500265053 /* PBXTargetDependency */,
F5643A020F792B4900A579C2 /* PBXTargetDependency */,
D8022C1A11DFE8ED003C21F6 /* PBXTargetDependency */,
);
Expand Down Expand Up @@ -1453,6 +1469,16 @@
target = 913D5E480E55644600CECEA2 /* cli tool */;
targetProxy = 913D5E590E5564F400CECEA2 /* PBXContainerItemProxy */;
};
AAC6960014F6D05B00501E30 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 913D5E480E55644600CECEA2 /* cli tool */;
targetProxy = AAC695FF14F6D05B00501E30 /* PBXContainerItemProxy */;
};
AAC6960214F6D0F700501E30 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 913D5E480E55644600CECEA2 /* cli tool */;
targetProxy = AAC6960114F6D0F700501E30 /* PBXContainerItemProxy */;
};
D8022C1A11DFE8ED003C21F6 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = D8022B1411DFCE7F003C21F6 /* libgit2 */;
Expand Down Expand Up @@ -1572,6 +1598,7 @@
INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = libgit2;
PRODUCT_NAME = GitX;
SDKROOT = macosx;
WRAPPER_EXTENSION = app;
ZERO_LINK = YES;
};
Expand All @@ -1598,6 +1625,7 @@
INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = libgit2;
PRODUCT_NAME = GitX;
SDKROOT = macosx;
WRAPPER_EXTENSION = app;
};
name = Release;
Expand Down Expand Up @@ -1655,6 +1683,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = gitx_askpasswd;
SDKROOT = macosx;
};
name = Debug;
};
Expand All @@ -1677,6 +1706,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = gitx_askpasswd;
SDKROOT = macosx;
ZERO_LINK = NO;
};
name = Release;
Expand All @@ -1698,6 +1728,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = gitx_askpasswd;
SDKROOT = macosx;
};
name = Install;
};
Expand All @@ -1721,6 +1752,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = gitx;
SDKROOT = macosx;
ZERO_LINK = YES;
};
name = Debug;
Expand All @@ -1744,6 +1776,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = gitx;
SDKROOT = macosx;
ZERO_LINK = NO;
};
name = Release;
Expand All @@ -1755,6 +1788,7 @@
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
PRODUCT_NAME = libgit2;
SDKROOT = macosx;
};
name = Debug;
};
Expand All @@ -1765,6 +1799,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
PRODUCT_NAME = libgit2;
SDKROOT = macosx;
ZERO_LINK = NO;
};
name = Release;
Expand All @@ -1776,6 +1811,7 @@
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
PRODUCT_NAME = "Generate PList Prefix";
SDKROOT = macosx;
};
name = Debug;
};
Expand All @@ -1787,6 +1823,7 @@
GCC_ENABLE_FIX_AND_CONTINUE = NO;
INFOPLIST_PREPROCESS = YES;
PRODUCT_NAME = "Generate PList Prefix";
SDKROOT = macosx;
ZERO_LINK = NO;
};
name = Release;
Expand Down Expand Up @@ -1823,6 +1860,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = GitXTesting;
SDKROOT = macosx;
};
name = Debug;
};
Expand Down Expand Up @@ -1853,6 +1891,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = GitXTesting;
SDKROOT = macosx;
ZERO_LINK = NO;
};
name = Release;
Expand Down Expand Up @@ -1882,7 +1921,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = SpeedTest;
SDKROOT = macosx10.5;
SDKROOT = macosx;
};
name = Debug;
};
Expand All @@ -1907,7 +1946,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = SpeedTest;
SDKROOT = iphoneos2.0;
SDKROOT = macosx;
ZERO_LINK = NO;
};
name = Release;
Expand Down
7 changes: 7 additions & 0 deletions GitX.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build_libgit2.sh
View file
Open in desktop
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