Commits

Lenard Lindstrom committed 5a9ef53

Undo bug introduced into Setup.in for ffmpeg

Comments (0)

Files changed (2)

 _numericsurfarray src/_numericsurfarray.c $(SDL) $(DEBUG)
 _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
 movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
-#_movie src/_gsound.c src/_gmovie.c src/_gcommand.c src/gmovie.c $(SDL) $(AVFORMAT) $(AVCODEC) $(SWSCALE) $(AVUTIL) $(MIXER) $(DEBUG)
+#_movie src/_gsound.c src/_gmovie.c src/_gcommand.c src/gmovie.c $(SDL) $(AVFORMAT) $(SWSCALE) $(MIXER) $(DEBUG)
 scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
 #_camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG)
 pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)

prebuilt-template/Setup_Win.in

 PORTTIME =
 AVFORMAT = -Iprebuilt/include -lavformat -lavcodec -lavutil -lws2_32
 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
 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