]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'e08c946c6860a78b0c479551d5f6735361160cbd'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 13 May 2013 09:23:11 +0000 (11:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 13 May 2013 09:23:16 +0000 (11:23 +0200)
* commit 'e08c946c6860a78b0c479551d5f6735361160cbd':
  configure: Explicitly disable PIC when targeting win32/mingw

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure

diff --cc configure
index 572701c3b1cedeb28fe7751579ca34ead49f93cf,2dc71efed306b86bd34c683945cdc734c99d9f29..f55245e2a94d60d22f6fb324ff70504a90539fc4
+++ b/configure
@@@ -3382,8 -3041,10 +3382,9 @@@ case $target_os i
          SLIB_INSTALL_EXTRA_LIB='lib$(SLIBNAME:$(SLIBSUF)=.dll.a) $(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.def)'
          SHFLAGS='-shared -Wl,--output-def,$$(@:$(SLIBSUF)=.orig.def) -Wl,--out-implib,$(SUBDIR)lib$(SLIBNAME:$(SLIBSUF)=.dll.a) -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-image-base'
          objformat="win32"
 -        dlltool="${cross_prefix}dlltool"
          ranlib=:
          enable dos_paths
+         disable pic
          ;;
      win32|win64)
          if enabled shared; then