contrib: set android specifics

[vlc] / contrib / src / main.mak

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index af079c11b28f6550349be94ec9507d88a31bdad5..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,18 +92,51 @@ 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
+AR=ar
+LD=ld
+STRIP=strip
+RANLIB=ranlib
 EXTRA_CFLAGS += -isysroot $(MACOSX_SDK) -mmacosx-version-min=$(OSX_VERSION)
 EXTRA_LDFLAGS += -Wl,-syslibroot,$(MACOSX_SDK) -mmacosx-version-min=$(OSX_VERSION) -isysroot $(MACOSX_SDK)
-# FIXME
+#TODO ppc
+ifeq ($(ARCH),x86_64)
+EXTRA_CFLAGS += -m64
+EXTRA_LDFLAGS += -m64
+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
+
 
 EXTRA_CFLAGS += -I$(PREFIX)/include
 CPPFLAGS := $(CPPFLAGS) $(EXTRA_CFLAGS)
@@ -172,12 +208,7 @@ HOSTCONF := --prefix="$(PREFIX)"
 HOSTCONF += --build="$(BUILD)" --host="$(HOST)" --target="$(HOST)"
 HOSTCONF += --program-prefix=""
 # libtool stuff:
-ifdef HAVE_MACOSX
-HOSTCONF += --enable-shared --disable-static
-else
-HOSTCONF += --enable-static --disable-shared
-endif
-HOSTCONF += --disable-dependency-tracking
+HOSTCONF += --enable-static --disable-shared --disable-dependency-tracking
 ifdef HAVE_WIN32
 HOSTCONF += --without-pic
 PIC :=
@@ -204,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)/%,$^), \
@@ -266,9 +298,26 @@ distclean: clean
        $(RM) config.mak
        unlink Makefile
 
+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))
+
+prebuilt: vlc-contrib-$(HOST)-latest.tar.bz2
+       $(UNPACK) && mv $(HOST) $(TOPDST)
+       cd $(TOPDST)/$(HOST) && ./change_prefix.sh
+
 package: install
-       (cd $(PREFIX)/.. && \
-       tar cvJ $(notdir $(PREFIX))/) > ../vlc-contrib-$(HOST)-$(DATE).tar.xz
+       rm -Rf tmp/
+       mkdir -p tmp/
+       cp -r $(PREFIX) tmp/
+       # remove useless files
+       cd tmp/$(notdir $(PREFIX)); \
+               cd share; rm -Rf man doc gtk-doc info lua projectM gettext; cd ..; \
+               rm -Rf man sbin etc lib/lua lib/sidplay
+       cp $(SRC)/change_prefix.sh tmp/$(notdir $(PREFIX))/
+       cd tmp/$(notdir $(PREFIX)) && ./change_prefix.sh $(PREFIX) @@CONTRIB_PREFIX@@
+       (cd tmp && tar c $(notdir $(PREFIX))/) | bzip2 -c > ../vlc-contrib-$(HOST)-$(DATE).tar.bz2
 
 list:
        @echo All packages:
@@ -286,7 +335,7 @@ list:
        @echo To-be-built packages:
        @echo '  $(PKGS)' | fmt
 
-.PHONY: all fetch fetch-all install mostlyclean clean distclean package list
+.PHONY: all fetch fetch-all install mostlyclean clean distclean package list prebuilt
 
 # CMake toolchain
 toolchain.cmake: