Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lyndon Brown
VLC
Commits
383a2090
Commit
383a2090
authored
9 years ago
by
David
Browse files
Options
Downloads
Patches
Plain Diff
bin: build a vlc-osx-static similar to vlc-static, to fix tests
parent
25f5b205
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Makefile.am
+4
-0
4 additions, 0 deletions
Makefile.am
bin/Makefile.am
+10
-0
10 additions, 0 deletions
bin/Makefile.am
with
14 additions
and
0 deletions
Makefile.am
+
4
−
0
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
...
...
This diff is collapsed.
Click to expand it.
bin/Makefile.am
+
10
−
0
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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment