virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

msvc: Move linker pragma from config.h to libavutil/internal.h

Browse Source 
This makes linking succeed for tools that include config.h but
don't link to libavutil.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2013-05-06 23:08:41 +03:00
parent bd392785a7
commit 06122c2533
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@ -4089,11 +4089,6 @@ fi
enabled getenv || echo "#define getenv(x) NULL" >> $TMPH enabled getenv || echo "#define getenv(x) NULL" >> $TMPH
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 ARCH_ "$config_files" $ARCH_LIST
print_config HAVE_ "$config_files" $HAVE_LIST print_config HAVE_ "$config_files" $HAVE_LIST
print_config CONFIG_ "$config_files" $CONFIG_LIST \ print_config CONFIG_ "$config_files" $CONFIG_LIST \

5
libavutil/internal.h
View File

@ -111,6 +111,11 @@
#include "libm.h" #include "libm.h"
#if defined(_MSC_VER) && !CONFIG_SHARED
#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_strtod")
#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_snprintf")
#endif
/** /**
* Return NULL if CONFIG_SMALL is true, otherwise the argument * Return NULL if CONFIG_SMALL is true, otherwise the argument
* without modification. Used to disable the definition of strings * without modification. Used to disable the definition of strings