cosmetics

[vlc] / contrib / src / main.mak

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index f4dbd5a5137da8e2b3cd6197de6b0b0c566b7e9c..db16e50cb954b55c4f9cd8684106187652918ee4 100644 (file)
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -13,6 +13,9 @@ TOPDST ?= ..
 SRC := $(TOPSRC)/src
 TARBALLS := $(TOPSRC)/tarballs
 
+PATH :=$(abspath ../../extras/tools/build/bin):$(PATH)
+export PATH
+
 PKGS_ALL := $(patsubst $(SRC)/%/rules.mak,%,$(wildcard $(SRC)/*/rules.mak))
 DATE := $(shell date +%Y%m%d)
 VPATH := $(TARBALLS)
@@ -90,7 +93,6 @@ endif
 endif
 
 ifdef HAVE_MACOSX
-OSX_VERSION=10.6
 MACOSX_SDK=/Developer/SDKs/MacOSX$(OSX_VERSION).sdk
 CC=gcc-4.2
 CXX=g++-4.2
@@ -108,6 +110,14 @@ else
 EXTRA_CFLAGS += -m32
 EXTRA_LDFLAGS += -m32
 endif
+
+XCODE_FLAGS = -sdk macosx$(OSX_VERSION)
+ifeq ($(xcodebuild -version 2>/dev/null | tee /dev/null|head -1|cut -d\  -f2|cut -d. -f1), 3)
+# XCode 3 doesn't support -arch
+else
+XCODE_FLAGS += -arch $(ARCH)
+endif
+
 endif
 
 
@@ -140,6 +150,11 @@ endif
 endif
 GIT ?= $(error git not found!)
 
+ifndef AUTOPOINT
+AUTOPOINT := "$(PREFIX)/bin/autopoint"
+export AUTOPOINT
+endif
+
 ifndef SVN
 ifeq ($(shell svn --version >/dev/null 2>&1 || echo FAIL),)
 SVN = svn
@@ -208,9 +223,10 @@ HOSTVARS_PIC := $(HOSTTOOLS) \
 download_git = \
        rm -Rf $(@:.tar.xz=) && \
        $(GIT) clone $(2:%=--branch %) $(1) $(@:.tar.xz=) && \
+       (cd $(@:.tar.xz=) && $(GIT) checkout $(3:%= %)) && \
        rm -Rf $(@:%.tar.xz=%)/.git && \
        (cd $(dir $@) && \
-        tar cvJ $(notdir $(@:.tar.xz=))) > $@ && \
+       tar cvJ $(notdir $(@:.tar.xz=))) > $@ && \
        rm -Rf $(@:.tar.xz=)
 checksum = \
        $(foreach f,$(filter $(TARBALLS)/%,$^), \