contrib: set android specifics

[vlc] / contrib / src / main.mak

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index e5af90070e7416d4800e958e3e8a6aa1001ba654..5ec18ee28b8e3011bb3ceb3e32b22aa5fc747caf 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)
@@ -89,8 +92,24 @@ STRIP := $(HOST)-strip
 endif
 endif
 
+ifdef HAVE_ANDROID
+CC :=  $(HOST)-gcc --sysroot=$(ANDROID_NDK)/platforms/android-9/arch-arm
+CXX := $(HOST)-g++ --sysroot=$(ANDROID_NDK)/platforms/android-9/arch-arm
+
+# Kludge for C++ prebuilt compiler
+EXTRA_CFLAGS += -D__STDC_VERSION__=199901L
+EXTRA_CFLAGS += -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/include
+ifdef HAVE_NEON
+    EXTRA_CFLAGS += -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include
+else
+    EXTRA_CFLAGS += -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/libs/armeabi/include
+endif
+
+# Change HOST to not confuse autotools
+HOST=arm-eabi
+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 +127,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
 
 
@@ -208,9 +235,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)/%,$^), \
@@ -270,7 +298,7 @@ distclean: clean
        $(RM) config.mak
        unlink Makefile
 
-PREBUILT_URL=ftp://ftp.videolan.org/pub/videolan/contrib/vlc-contrib-$(HOST)-latest.tar.bz2
+PREBUILT_URL=ftp://ftp.videolan.org/pub/videolan/contrib/$(HOST)/vlc-contrib-$(HOST)-latest.tar.bz2
 
 vlc-contrib-$(HOST)-latest.tar.bz2:
        $(call download,$(PREBUILT_URL))