Skip to content

V
vlc-2-2
Commit e7586f1a authored by Steve Lhomme's avatar Steve Lhomme
Browse files
Options

contrib: make the SVN vs release build really work on OS X

parent 5ebc545b
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 10 deletions
extras/contrib/src/Makefile
View file @ e7586f1a
...@@ -645,15 +645,16 @@ DISTCLEAN_PKG += lame-$(LAME_VERSION).tar.gz ...@@ -645,15 +645,16 @@ DISTCLEAN_PKG += lame-$(LAME_VERSION).tar.gz
# libebml # libebml
# *************************************************************************** # ***************************************************************************
ifdef SVN
libebml:
$(SVN) co http://svn.matroska.org/svn/matroska/trunk/libebml libebml
else
libebml-$(LIBEBML_VERSION).tar.bz2: libebml-$(LIBEBML_VERSION).tar.bz2:
$(WGET) $(LIBEBML_URL) $(WGET) $(LIBEBML_URL)
libebml: libebml-$(LIBEBML_VERSION).tar.bz2 libebml: libebml-$(LIBEBML_VERSION).tar.bz2
ifdef $(SVN) $(EXTRACT_BZ2)
$(SVN) co http://svn.matroska.org/svn/matroska/trunk/libebml libebml endif
else
$(EXTRACT_BZ2)
endif
.ebml: libebml .ebml: libebml
(cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX)) (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
...@@ -668,15 +669,16 @@ DISTCLEAN_PKG += libebml-$(LIBEBML_VERSION).tar.bz2 ...@@ -668,15 +669,16 @@ DISTCLEAN_PKG += libebml-$(LIBEBML_VERSION).tar.bz2
# libmatroska # libmatroska
# *************************************************************************** # ***************************************************************************
ifdef SVN
libmatroska:
$(SVN) co http://svn.matroska.org/svn/matroska/trunk/libmatroska libmatroska
else
libmatroska-$(LIBMATROSKA_VERSION).tar.bz2: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
$(WGET) $(LIBMATROSKA_URL) $(WGET) $(LIBMATROSKA_URL)
libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2 libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
ifdef $(SVN) $(EXTRACT_BZ2)
$(SVN) co http://svn.matroska.org/svn/matroska/trunk/libmatroska libmatroska endif
else
$(EXTRACT_BZ2)
endif
.matroska: libmatroska .matroska: libmatroska
(cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX)) (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment