Changeset 6ed527e81716d8d7dea81f26ccfa7771ad67f6a6

Timestamp:

10/12/06 20:56:13 (2 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1165780573 +0000

git-parent:

[98b71c2564df05348d4615870caf2b147530dc3f]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1165780573 +0000

Message:

Use shared libvlc on Win32

Files:

• Makefile.am (modified) (3 diffs)
• activex/Makefile.am (modified) (4 diffs)
• configure.ac (modified) (3 diffs)
• mozilla/Makefile.am (modified) (1 diff)
• src/Makefile.am (modified) (3 diffs)

Makefile.am

@@ -287 +287 @@
-vlc_LDFLAGS =
-else
-BUILD_SHARED
+HAVE_WIN32
-vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` -Wl,-rpath $(libdir) -L$(top_builddir)/src -lvlc
-if HAVE_WIN32
-LIB_libvlc = libvlc.dll.a
-else
-LIB_libvlc = libvlc$(LIBEXT)
-endif
-LIBVLC =
-else
@@ -671 +667 @@
-    cp "$(top_builddir)/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/"
-    cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/"
-if BUILD_SHARED
-    cp "src/libvlc$(LIBEXT)" "vlc-${VERSION}/"
-endif
-
-    for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
@@ -740 +734 @@
-package-win-common-strip:
-    $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)"
-if BUILD_SHARED
-    $(STRIP) "vlc-${VERSION}/libvlc$(LIBEXT)"
-endif
-if BUILD_MOZILLA
-    $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT);

activex/Makefile.am

@@ -65 +65 @@
-    $(NULL)
-
-if BUILD_SHARED
-LIBRARIES_libvlc = $(top_builddir)/src/libvlc.dll.a
-else
-LIBRARIES_libvlc = $(top_builddir)/src/libvlc.a
-endif
-
-if BUILD_ACTIVEX
@@ -77 +73 @@
-axvlcdir = $(libdir)
-
- builtin
+
-
-libaxvlc_a_SOURCES = $(SOURCES_activex) $(SOURCE_dll)
@@ -85 +81 @@
-
-axvlc$(LIBEXT): $(libaxvlc_a_OBJECTS) \
- stamp-builtin
+
-    $(CXXLINK) $(libaxvlc_a_OBJECTS) $(DATA_axvlc_rc) \
-    $(srcdir)/axvlc.def \
@@ -135 +131 @@
-
-###############################################################################
-# Stamp rules
-###############################################################################
-
-clean-stamp:
-    rm -f stamp-builtin
-
-if BUILD_SHARED
-stamp-builtin:
-else
-stamp-builtin: $(shell ${VLC_CONFIG} --target builtin)
-endif
-    @touch $@
-
-
-###############################################################################
-# Clean rules
-###############################################################################

configure.ac

@@ -280 +280 @@
-
-AC_ARG_ENABLE(libtool,
-dis
+en
-AM_CONDITIONAL(USE_LIBTOOL, [test "x${enable_libtool}" != "xno"])
-
@@ -1444 +1444 @@
-[  --enable-release        activate extra optimizations (default disabled)])
-test "${enable_release}" != "yes" && enable_release="no"
-
-dnl
-dnl  Is the shared libvlc forced ?
-dnl
-AC_ARG_ENABLE(shared-libvlc,
-  [  --enable-shared-libvlc  Win32 libvlc.dll build (default disabled)])
-AS_IF([test "${enable_libtool}" != "no" && test "${enable_shared_libvlc}"], [
-  AC_MSG_ERROR([--enable-shared-libvlc and --enable-libtool are mutually exclusive])
-])
-
-dnl
@@ -5548 +5539 @@
-dnl Pic and shared libvlc stuff
-dnl
-
-
-
+
-  AC_DEFINE(HAVE_SHARED_LIBVLC, 1, [Define to 1 if libvlc is built as a shared library.])
-  FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll"

mozilla/Makefile.am

@@ -24 +24 @@
-    support/npwin.cpp support/npmac.cpp support/npunix.c
-
-if BUILD_SHARED
-LIBRARIES_libvlc_pic = -Wl,-rpath '$(libdir)' -L$(top_builddir)/src -lvlc
-LIBRARIES_libvlc_nopic = $(LIBRARIES_libvlc_pic)
-else
-LIBRARIES_libvlc_pic = $(top_builddir)/src/libvlc.a
-LIBRARIES_libvlc_nopic = $(top_builddir)/src/libvlc.a
-endif
-
-if BUILD_MOZILLA

src/Makefile.am

@@ -155 +155 @@
-
-if HAVE_WIN32
-if BUILD_SHARED
-DATA_noinst_libvlc = libvlc$(LIBEXT) libvlc$(LIBEXT).a
-endif
-
-libvlc.dll.a: libvlc$(LIBEXT)
@@ -331 +329 @@
-
-if !USE_LIBTOOL
-BUILD_SHARED
+HAVE_WIN32
-CLEANFILES += misc/version.c
-endif
@@ -352 +350 @@
-
-if !USE_LIBTOOL
-BUILD_SHARED
+HAVE_WIN32
-stamp-api: Makefile.in $(HEADERS_include) ../vlc-api.pl
-    ( cd $(srcdir) && cat $(HEADERS_include) ) | \