Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
383a2090
Commit
383a2090
authored
Jun 21, 2015
by
David
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bin: build a vlc-osx-static similar to vlc-static, to fix tests
parent
25f5b205
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
0 deletions
+14
-0
Makefile.am
Makefile.am
+4
-0
bin/Makefile.am
bin/Makefile.am
+10
-0
No files found.
Makefile.am
View file @
383a2090
...
...
@@ -973,7 +973,11 @@ noinst_SCRIPTS = vlc$(EXEEXT)
endif
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)
endif
TESTS
=
test
/run_vlc.sh
dist_noinst_SCRIPTS
+=
test
/run_vlc.sh
...
...
bin/Makefile.am
View file @
383a2090
...
...
@@ -2,6 +2,7 @@
#
if
HAVE_DARWIN
bin_PROGRAMS
=
vlc-osx
noinst_PROGRAMS
=
vlc-osx-static
else
bin_PROGRAMS
=
vlc
noinst_PROGRAMS
=
vlc-static
...
...
@@ -31,10 +32,19 @@ if HAVE_WIN32
vlc_SOURCES
=
winvlc.c
noinst_DATA
+=
vlc_win32_rc.rc
endif
if
HAVE_DARWIN
vlc_osx_SOURCES
=
darwinvlc.m
vlc_osx_LDFLAGS
=
$(LDFLAGS_vlc)
-Wl
,-framework,CoreFoundation,-framework,Cocoa
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
vlc_wrapper_SOURCES
=
rootwrap.c
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment