diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-12-07 19:27:00 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-12-07 19:27:00 +0000 |
| commit | a77caa4dc92d1865a823574a09de789ad553423b (patch) | |
| tree | 322ca6c6ad3274e408615b205915a2d5908a6f4b | |
| parent | da34f7ac236ccf5d25aafac249e3d6dc934bde4c (diff) | |
| download | ffmpeg-a77caa4dc92d1865a823574a09de789ad553423b.tar.gz | |
fix mingw shared build, and get rid of FF_IMPORT_ATTR
Originally committed as revision 7253 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavutil/common.h | 9 | ||||
| -rw-r--r-- | libavutil/internal.h | 2 |
3 files changed, 3 insertions, 10 deletions
@@ -1072,7 +1072,7 @@ EOF SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)' SLIB_EXTRA_CMD="-lib /machine:i386 /def:\$(@:${SLIBSUF}=.def)" - SHFLAGS="-shared -Wl,--output-def,\$(@:${SLIBSUF}=.def),--out-implib,lib\$(SLIBNAME:\$(SLIBSUF)=.dll.a)" + SHFLAGS="-shared -Wl,--output-def,\$(@:${SLIBSUF}=.def),--out-implib,lib\$(SLIBNAME:\$(SLIBSUF)=.dll.a) -Wl,--enable-runtime-pseudo-reloc" fi # Combine FFLDFLAGS and the LDFLAGS environment variable. diff --git a/libavutil/common.h b/libavutil/common.h index 65573f0998..77b1c3f1fa 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -58,13 +58,6 @@ #define UINT64_C(c) (c ## ULL) #endif -#if defined(__MINGW32__) && !defined(BUILD_AVUTIL) && defined(BUILD_SHARED_AV) -# define FF_IMPORT_ATTR __declspec(dllimport) -#else -# define FF_IMPORT_ATTR -#endif - - #ifdef HAVE_AV_CONFIG_H /* only include the following when compiling package */ # include "internal.h" @@ -83,7 +76,7 @@ #define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0) /* misc math functions */ -extern FF_IMPORT_ATTR const uint8_t ff_log2_tab[256]; +extern const uint8_t ff_log2_tab[256]; static inline int av_log2(unsigned int v) { diff --git a/libavutil/internal.h b/libavutil/internal.h index b9299bf05c..6e3e47af0b 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -229,7 +229,7 @@ extern const uint32_t ff_inverse[256]; # define FASTDIV(a,b) ((a)/(b)) #endif -extern FF_IMPORT_ATTR const uint8_t ff_sqrt_tab[128]; +extern const uint8_t ff_sqrt_tab[128]; static inline int ff_sqrt(int a) { |