Skip to content

Commit abbb208

Browse files
committed
xcode 4
1 parent 82f69a7 commit abbb208

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

GitX.xcodeproj/project.pbxproj

+17-9
Original file line numberDiff line numberDiff line change
@@ -1344,6 +1344,7 @@
13441344
isa = PBXProject;
13451345
buildConfigurationList = 26FC0A880875C7B200E6366F /* Build configuration list for PBXProject "GitX" */;
13461346
compatibilityVersion = "Xcode 3.1";
1347+
developmentRegion = English;
13471348
hasScannedForEncodings = 1;
13481349
knownRegions = (
13491350
English,
@@ -1789,6 +1790,7 @@
17891790
INSTALL_PATH = "$(HOME)/Applications";
17901791
LIBRARY_SEARCH_PATHS = libgit2;
17911792
PRODUCT_NAME = GitX;
1793+
SDKROOT = "";
17921794
WRAPPER_EXTENSION = app;
17931795
ZERO_LINK = YES;
17941796
};
@@ -1815,44 +1817,43 @@
18151817
INSTALL_PATH = "$(HOME)/Applications";
18161818
LIBRARY_SEARCH_PATHS = libgit2;
18171819
PRODUCT_NAME = GitX;
1820+
SDKROOT = "";
18181821
WRAPPER_EXTENSION = app;
18191822
};
18201823
name = Release;
18211824
};
18221825
26FC0A890875C7B200E6366F /* Debug */ = {
18231826
isa = XCBuildConfiguration;
18241827
buildSettings = {
1825-
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
1828+
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
18261829
GCC_ENABLE_OBJC_GC = required;
18271830
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
18281831
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = DEBUG_BUILD;
18291832
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
18301833
GCC_WARN_ABOUT_RETURN_TYPE = YES;
18311834
GCC_WARN_UNUSED_VARIABLE = YES;
18321835
INFOPLIST_PREPROCESS = YES;
1836+
MACOSX_DEPLOYMENT_TARGET = 10.5;
18331837
PREBINDING = NO;
18341838
RUN_CLANG_STATIC_ANALYZER = YES;
1835-
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
1839+
SDKROOT = macosx10.5;
18361840
};
18371841
name = Debug;
18381842
};
18391843
26FC0A8A0875C7B200E6366F /* Release */ = {
18401844
isa = XCBuildConfiguration;
18411845
buildSettings = {
1842-
ARCHS = (
1843-
ppc,
1844-
i386,
1845-
x86_64,
1846-
);
1846+
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
18471847
GCC_ENABLE_OBJC_GC = required;
18481848
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
18491849
GCC_WARN_ABOUT_RETURN_TYPE = YES;
18501850
GCC_WARN_UNUSED_VARIABLE = YES;
18511851
INFOPLIST_PREFIX_HEADER = $PROJECT_TEMP_DIR/revision;
18521852
INFOPLIST_PREPROCESS = YES;
1853+
MACOSX_DEPLOYMENT_TARGET = 10.5;
18531854
PREBINDING = NO;
18541855
RUN_CLANG_STATIC_ANALYZER = YES;
1855-
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
1856+
SDKROOT = macosx10.5;
18561857
};
18571858
name = Release;
18581859
};
@@ -1876,6 +1877,7 @@
18761877
);
18771878
PREBINDING = NO;
18781879
PRODUCT_NAME = gitx_askpasswd;
1880+
SDKROOT = "";
18791881
};
18801882
name = Debug;
18811883
};
@@ -1884,7 +1886,7 @@
18841886
buildSettings = {
18851887
ALWAYS_SEARCH_USER_PATHS = NO;
18861888
COPY_PHASE_STRIP = YES;
1887-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1889+
DEBUG_INFORMATION_FORMAT = dwarf;
18881890
GCC_ENABLE_FIX_AND_CONTINUE = NO;
18891891
GCC_MODEL_TUNING = G5;
18901892
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1898,6 +1900,7 @@
18981900
);
18991901
PREBINDING = NO;
19001902
PRODUCT_NAME = gitx_askpasswd;
1903+
SDKROOT = "";
19011904
ZERO_LINK = NO;
19021905
};
19031906
name = Release;
@@ -1919,6 +1922,7 @@
19191922
);
19201923
PREBINDING = NO;
19211924
PRODUCT_NAME = gitx_askpasswd;
1925+
SDKROOT = "";
19221926
};
19231927
name = Install;
19241928
};
@@ -1942,6 +1946,7 @@
19421946
);
19431947
PREBINDING = NO;
19441948
PRODUCT_NAME = gitx;
1949+
SDKROOT = "";
19451950
ZERO_LINK = YES;
19461951
};
19471952
name = Debug;
@@ -1965,6 +1970,7 @@
19651970
);
19661971
PREBINDING = NO;
19671972
PRODUCT_NAME = gitx;
1973+
SDKROOT = "";
19681974
ZERO_LINK = NO;
19691975
};
19701976
name = Release;
@@ -1976,6 +1982,7 @@
19761982
GCC_DYNAMIC_NO_PIC = NO;
19771983
GCC_OPTIMIZATION_LEVEL = 0;
19781984
PRODUCT_NAME = libgit2;
1985+
SDKROOT = "";
19791986
};
19801987
name = Debug;
19811988
};
@@ -1986,6 +1993,7 @@
19861993
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
19871994
GCC_ENABLE_FIX_AND_CONTINUE = NO;
19881995
PRODUCT_NAME = libgit2;
1996+
SDKROOT = "";
19891997
ZERO_LINK = NO;
19901998
};
19911999
name = Release;

build_libgit2.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ buildAction () {
1717
git submodule update
1818
cd libgit2
1919
rm -f libgit2.a
20-
make CFLAGS="-arch i386 -arch ppc -arch x86_64"
20+
make CFLAGS="-arch i386 -arch x86_64"
2121
ranlib libgit2.a
2222
else
2323
echo "error: Not a git repository."

0 commit comments

Comments
 (0)