Commits

Lenard Lindstrom committed 691c36e

Update ffmpeg support in Windows config for msys and prebuilt (VC support deprecated as ffpeg does not build with VC anyway)

Comments (0)

Files changed (2)

         Dependency('JPEG', 'jpeglib.h', 'libjpeg.dll.a'),
         Dependency('PORTMIDI', 'portmidi.h', 'libportmidi.dll.a'),
         Dependency('PORTTIME', 'portmidi.h', 'libportmidi.dll.a'),
-        Dependency('AVFORMAT', 'libavformat/avformat.h', 'libavformat.dll.a'),
-        Dependency('AVCODEC', 'libavcodec/avcodec.h', 'libavcodec.dll.a'),
-        Dependency('AVUTIL', 'libavutil/avutil.h', 'libavutil.dll.a'),
-        Dependency('SWSCALE', 'libswscale/swscale.h', 'libswscale.dll.a'),
+        Dependency('AVFORMAT', 'libavformat/avformat.h', 'libavformat.dll.a',
+                   ['avformat', 'avcodec', 'avutil']),
+        Dependency('SWSCALE', 'libswscale/swscale.h', 'libswscale.dll.a',
+                   ['swscale', 'avutil']),
         DependencyDLL('TIFF'),
         DependencyDLL('VORBISFILE'),
         DependencyDLL('VORBIS'),
         DependencyDLL('OGG'),
         DependencyDLL('FREETYPE'),
         DependencyDLL('Z'),
+        DependencyDLL('AVCODEC'),
+        DependencyDLL('AVUTIL'),
     ]
 
     if not DEPS[0].found:

prebuilt-template/Setup_Win.in

 OGG = -Iprebuilt/include/ogg -logg
 PORTMIDI = -lportmidi
 PORTTIME =
-AVFORMAT = -Iprebuilt/include -lavformat -lavcodec -lavutil -lws2_32
+AVFORMAT = -Iprebuilt/include -lavformat -lavcodec -lavutil
 SWSCALE = -Iprebuilt/include -lswscale -lavutil
-# Make sure ffmpeg headers are included by make_prebuilt.py.
-FFMPEG_HDR_DIRS = -Iprebuilt/include/libavformat -Iprebuilt/include/libavcodec -Iprebuilt/include/libswscale -Iprebuilt/include/avutil
+# Ensure make_prebuilt.py includes the ffmpeg headers.
+COPYHDRS_AVFORMAT = -lavformat -Iprebuilt/include/libavformat
+COPYHDRS_SWCALE = -lswscale -Iprebuilt/include/libswscale
+COPYHDRS_AVCODEC = -lavcodec -Iprebuilt/include/libavcodec
+COPYHDRS_AVUTIL = -lavutil -Iprebuilt/include/libavutil
+# The DLL's
 COPYLIB_SDL -Lprebuilt/lib/SDL.dll
 COPYLIB_SDL_ttf -lSDL -lfreetype -Lprebuilt/lib/SDL_ttf.dll
 COPYLIB_SDL_image -lSDL -ljpef -lpng -ltiff -Lprebuilt/lib/SDL_image.dll