On Sat, 13 Oct 2012, Diego Biurrun wrote:
On Sat, Oct 13, 2012 at 01:46:38PM +0300, Martin Storsjö wrote:
--- a/configure
+++ b/configure
@@ -2778,14 +2778,33 @@ case $target_os in
shlibdir_default="$bindir_default"
SLIBPREF=""
SLIBSUF=".dll"
+ if enabled_all msvc shared; then
+ # Link to the import library instead of the
+ # normal static library.
+ LD_LIB='%.lib'
+ fi
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)'
- SLIB_EXTRA_CMD=-'$(DLLTOOL) -m $(LIBTARGET) -d $$(@:$(SLIBSUF)=.def)
-l $(SUBDIR)$(SLIBNAME:$(SLIBSUF)=.lib) -D $(SLIBNAME_WITH_MAJOR)'
+ if enabled msvc; then
+ # The libtarget names for lib.exe differ from the ones for dlltool
+ if enabled x86_64; then
+ LIBTARGET=x64
+ fi
+ SLIB_CREATE_DEF_CMD='makedef $(SUBDIR)lib$(NAME).ver $(OBJS) >
$$(@:$(SLIBSUF)=.def)'
+ SLIB_EXTRA_CMD='-lib.exe -machine:$(LIBTARGET)
-def:$$(@:$(SLIBSUF)=.def) -out:$(SUBDIR)$(SLIBNAME:$(SLIBSUF)=.lib)'
+ else
+ SLIB_EXTRA_CMD=-'$(DLLTOOL) -m $(LIBTARGET) -d
$$(@:$(SLIBSUF)=.def) -l $(SUBDIR)$(SLIBNAME:$(SLIBSUF)=.lib) -D
$(SLIBNAME_WITH_MAJOR)'
+ fi
SLIB_INSTALL_NAME='$(SLIBNAME_WITH_MAJOR)'
SLIB_INSTALL_LINKS=
SLIB_INSTALL_EXTRA_SHLIB='$(SLIBNAME:$(SLIBSUF)=.lib)'
- SLIB_INSTALL_EXTRA_LIB='lib$(SLIBNAME:$(SLIBSUF)=.dll.a)
$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.def)'
- SHFLAGS='-shared -Wl,--output-def,$$(@:$(SLIBSUF)=.def)
-Wl,--out-implib,$(SUBDIR)lib$(SLIBNAME:$(SLIBSUF)=.dll.a)
-Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-image-base'
+ if enabled msvc; then
+ SLIB_INSTALL_EXTRA_LIB='$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.def)'
+ SHFLAGS='-dll -def:$$(@:$(SLIBSUF)=.def)
-implib:$(SUBDIR)lib$(SLIBNAME:$(SLIBSUF)=.dll.a)'
+ else
+ SLIB_INSTALL_EXTRA_LIB='lib$(SLIBNAME:$(SLIBSUF)=.dll.a)
$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.def)'
+ SHFLAGS='-shared -Wl,--output-def,$$(@:$(SLIBSUF)=.def)
-Wl,--out-implib,$(SUBDIR)lib$(SLIBNAME:$(SLIBSUF)=.dll.a)
-Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-image-base'
+ fi
objformat="win32"
dlltool="${cross_prefix}dlltool"
ranlib=:
I suggest to separate the MinGW and MSVC sections completely. That would
be both more readable and more maintainable. I fear that otherwise
changes for one system will break the other.
@@ -3521,6 +3540,8 @@ elif enabled pathscale; then
add_cflags -fstrict-overflow -OPT:wrap_around_unsafe_opt=OFF
elif enabled msvc; then
enabled x86_32 && disable aligned_stack
+ enabled_all shared static &&
+ die "Cannot build shared and static libraries at the same time with
MSVC"
End in a period.
--- a/libavcodec/ac3tab.h
+++ b/libavcodec/ac3tab.h
@@ -24,6 +24,7 @@
#include "libavutil/common.h"
#include "ac3.h"
+#include "symbols.h"
@@ -33,7 +34,7 @@
extern const uint8_t ff_ac3_channels_tab[8];
-extern const uint16_t avpriv_ac3_channel_layout_tab[8];
+extern AVCODEC_SYMBOL const uint16_t avpriv_ac3_channel_layout_tab[8];
extern const uint8_t ff_ac3_enc_channel_map[8][2][6];
What's the verdict wrt cross-library (data) symbols. What shall we do
about them?
About this, the only ones left now are private ones, so the current
solution doesn't have to be permanent, since it's not visible in the
public installed headers (in previous iterations, a flag for whether the
build is shared had to be added to the installed avconfig.h).
// Martin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
