Skip to content

V
vlc-2-2
Commit 46060128 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* Makefile.am: using C++ linkage for vlc under OS X and BeOS.

parent 9c961cc5
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
Makefile.am
View file @ 46060128
...@@ -462,7 +462,15 @@ DEPENDENCIES_vlc = lib/libvlc.a $(L_builtin) $(DATA_win32_rc) $(LIB_intl) ...@@ -462,7 +462,15 @@ DEPENDENCIES_vlc = lib/libvlc.a $(L_builtin) $(DATA_win32_rc) $(LIB_intl)
vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
@rm -f $(srcdir)/vlc$(EXEEXT) @rm -f $(srcdir)/vlc$(EXEEXT)
if HAVE_BEOS
$(CXXLINK) $(vlc_LDFLAGS) $(vlc_OBJECTS) $(vlc_LDADD) $(LIBS)
else
if HAVE_DARWIN
$(CXXLINK) $(vlc_LDFLAGS) $(vlc_OBJECTS) $(vlc_LDADD) $(LIBS)
else
$(LINK) $(vlc_LDFLAGS) $(vlc_OBJECTS) $(vlc_LDADD) $(LIBS) $(LINK) $(vlc_LDFLAGS) $(vlc_OBJECTS) $(vlc_LDADD) $(LIBS)
endif
endif
if HAVE_BEOS if HAVE_BEOS
xres -o $@ $(srcdir)/share/vlc_beos.rsrc xres -o $@ $(srcdir)/share/vlc_beos.rsrc
......
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