Commit 383a2090 authored by David Fuhrmann's avatar David Fuhrmann

bin: build a vlc-osx-static similar to vlc-static, to fix tests

parent 25f5b205
...@@ -973,7 +973,11 @@ noinst_SCRIPTS = vlc$(EXEEXT) ...@@ -973,7 +973,11 @@ noinst_SCRIPTS = vlc$(EXEEXT)
endif endif
vlc$(EXEEXT): vlc$(EXEEXT):
if HAVE_DARWIN
$(AM_V_GEN)$(LN_S) -f bin/vlc-osx-static vlc
else
$(AM_V_GEN)$(LN_S) -f bin/vlc-static$(EXEEXT) vlc$(EXEEXT) $(AM_V_GEN)$(LN_S) -f bin/vlc-static$(EXEEXT) vlc$(EXEEXT)
endif
TESTS = test/run_vlc.sh TESTS = test/run_vlc.sh
dist_noinst_SCRIPTS += test/run_vlc.sh dist_noinst_SCRIPTS += test/run_vlc.sh
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# #
if HAVE_DARWIN if HAVE_DARWIN
bin_PROGRAMS = vlc-osx bin_PROGRAMS = vlc-osx
noinst_PROGRAMS = vlc-osx-static
else else
bin_PROGRAMS = vlc bin_PROGRAMS = vlc
noinst_PROGRAMS = vlc-static noinst_PROGRAMS = vlc-static
...@@ -31,10 +32,19 @@ if HAVE_WIN32 ...@@ -31,10 +32,19 @@ if HAVE_WIN32
vlc_SOURCES = winvlc.c vlc_SOURCES = winvlc.c
noinst_DATA += vlc_win32_rc.rc noinst_DATA += vlc_win32_rc.rc
endif endif
if HAVE_DARWIN if HAVE_DARWIN
vlc_osx_SOURCES = darwinvlc.m vlc_osx_SOURCES = darwinvlc.m
vlc_osx_LDFLAGS = $(LDFLAGS_vlc) -Wl,-framework,CoreFoundation,-framework,Cocoa vlc_osx_LDFLAGS = $(LDFLAGS_vlc) -Wl,-framework,CoreFoundation,-framework,Cocoa
vlc_osx_LDADD = ../lib/libvlc.la vlc_osx_LDADD = ../lib/libvlc.la
vlc_osx_static_SOURCES = $(vlc_osx_SOURCES)
vlc_osx_static_OBJCFLAGS = $(AM_OBJCFLAGS) \
-DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\" \
-DTOP_SRCDIR=\"$$(cd "$(top_srcdir)"; pwd)\" \
$(NULL)
vlc_osx_static_LDFLAGS = $(vlc_osx_LDFLAGS) -static
vlc_osx_static_LDADD = $(vlc_osx_LDADD)
endif endif
vlc_wrapper_SOURCES = rootwrap.c vlc_wrapper_SOURCES = rootwrap.c
......
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