diff options
author | Martin Storsjö <martin@martin.st> | 2013-05-02 11:01:43 +0300 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2013-05-03 13:34:34 +0300 |
commit | 769d921f3e4d3808320238f4f33b47cd492f1c04 (patch) | |
tree | 9f03c60d7d8380e19555a777850954d72ab794b0 | |
parent | af4cc2605c7a56ecfd84c264aa2b325020418472 (diff) | |
download | ffmpeg-769d921f3e4d3808320238f4f33b47cd492f1c04.tar.gz |
compat: msvc: Make sure the object files are included when linking statically
If building libav with -MD in the cflags (for making the MSVC compiler
generate code for using a dynamically linked libc), the system headers
that declare strtod, snprintf and vsnprintf declare the functions as
imported from a DLL. To hook up wrappers of our own for these functions,
the function names are defined to avpriv_*, so that the calling code
within libav calls the wrappers instead. Since these functions
are declared to be imported from DLLs, the calling code expects to
load them from DLL import function pointers (creating references to
_imp__avpriv_strtod instead of directly to avpriv_strtod). If the
libav libraries are not built as DLLs, no such function pointers (as
the calling code expects) are created.
The linker can fix this up automatically in some cases (producing
warnings LNK4217 and LNK4049), if the object files are already
included. By telling the linker to try to include those symbols
(without the _imp prefix as the calling code ends up using),
we get the object files included, so that the linker can do the
automatic fixup. This is done via config.h, so that all (or at least
most) of the object files in our libraries force including the compat
files, to make sure they are included regardless of what files from our
static libraries actually are included.
Signed-off-by: Martin Storsjö <martin@martin.st>
-rwxr-xr-x | configure | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -4082,6 +4082,11 @@ if enabled yasm; then printf '' >$TMPASM fi +if enabled msvc && ! enabled shared; then + echo '#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_strtod")' >> $TMPH + echo '#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_snprintf")' >> $TMPH +fi + print_config ARCH_ "$config_files" $ARCH_LIST print_config HAVE_ "$config_files" $HAVE_LIST print_config CONFIG_ "$config_files" $CONFIG_LIST \ |