Commit 80def97f authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Continue fixing static builds

parent 7ca5e9c1
...@@ -278,7 +278,7 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES) ...@@ -278,7 +278,7 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
objc) cmd="$(OBJCLINK)" ;; \ objc) cmd="$(OBJCLINK)" ;; \
c|*) cmd="$(LINK)" ;; \ c|*) cmd="$(LINK)" ;; \
esac ; \ esac ; \
cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDFLAGS) $(vlc_LDADD)" ; \ cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)" ; \
echo $$cmd ; \ echo $$cmd ; \
eval $$cmd eval $$cmd
......
...@@ -221,6 +221,7 @@ EXTRA_LTLIBRARIES = ${extra_ltlibs} ...@@ -221,6 +221,7 @@ EXTRA_LTLIBRARIES = ${extra_ltlibs}
include Modules.am include Modules.am
if HAVE_PLUGINS
LTLIBVLC = -L\$(top_builddir)/src -lvlc LTLIBVLC = -L\$(top_builddir)/src -lvlc
AM_LDFLAGS = -rpath '\$(libvlcdir)' -avoid-version \\ AM_LDFLAGS = -rpath '\$(libvlcdir)' -avoid-version \\
...@@ -231,6 +232,7 @@ else ...@@ -231,6 +232,7 @@ else
AM_LDFLAGS += -export-symbol-regex ^\$(VLC_ENTRY)\$\$ AM_LDFLAGS += -export-symbol-regex ^\$(VLC_ENTRY)\$\$
endif endif
AM_LIBADD = \$(LTLIBVLC) AM_LIBADD = \$(LTLIBVLC)
endif
all: all-modules all: all-modules
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
* if user has #defined MODULE_NAME foo, then we will need: * if user has #defined MODULE_NAME foo, then we will need:
* #define MODULE_STRING "foo" * #define MODULE_STRING "foo"
* *
* and, if __BUILTIN__ is set, we will also need: * and, if HAVE_DYNAMIC_PLUGINS is NOT set, we will also need:
* #define MODULE_FUNC( zog ) module_foo_zog * #define MODULE_FUNC( zog ) module_foo_zog
* *
* this can't easily be done with the C preprocessor, thus a few ugly hacks. * this can't easily be done with the C preprocessor, thus a few ugly hacks.
...@@ -56,12 +56,12 @@ ...@@ -56,12 +56,12 @@
/* If the module is built-in, then we need to define foo_InitModule instead /* If the module is built-in, then we need to define foo_InitModule instead
* of InitModule. Same for Activate- and DeactivateModule. */ * of InitModule. Same for Activate- and DeactivateModule. */
#if defined( __BUILTIN__ ) #if defined (HAVE_DYNAMIC_PLUGINS)
# define E_( function ) CONCATENATE( function, MODULE_NAME )
# define __VLC_SYMBOL( symbol ) CONCATENATE( symbol, MODULE_NAME )
#elif defined( __PLUGIN__ )
# define E_( function ) CONCATENATE( function, MODULE_SYMBOL ) # define E_( function ) CONCATENATE( function, MODULE_SYMBOL )
# define __VLC_SYMBOL( symbol ) CONCATENATE( symbol, MODULE_SYMBOL ) # define __VLC_SYMBOL( symbol ) CONCATENATE( symbol, MODULE_SYMBOL )
#else
# define E_( function ) CONCATENATE( function, MODULE_NAME )
# define __VLC_SYMBOL( symbol ) CONCATENATE( symbol, MODULE_NAME )
#endif #endif
#if defined( __PLUGIN__ ) && ( defined( WIN32 ) || defined( UNDER_CE ) ) #if defined( __PLUGIN__ ) && ( defined( WIN32 ) || defined( UNDER_CE ) )
......
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