Originally committed as revision 2203 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
| @@ -191,6 +191,10 @@ dv1394="no" | |||||
| ffserver="no" | ffserver="no" | ||||
| network="no" | network="no" | ||||
| mingw32="yes" | mingw32="yes" | ||||
| LIBPREF="" | |||||
| LIBSUF=".lib" | |||||
| SLIBPREF="" | |||||
| SLIBSUF=".dll" | |||||
| ;; | ;; | ||||
| CYGWIN*) | CYGWIN*) | ||||
| v4l="no" | v4l="no" | ||||
| @@ -885,6 +889,9 @@ if test "$mmx" = "yes" ; then | |||||
| echo "#define HAVE_MMX 1" >> $TMPH | echo "#define HAVE_MMX 1" >> $TMPH | ||||
| echo "#define __CPU__ 586" >> $TMPH | echo "#define __CPU__ 586" >> $TMPH | ||||
| fi | fi | ||||
| if test "$mingw32" = "yes" ; then | |||||
| echo "TARGET_MINGW32=yes" >> config.mak | |||||
| fi | |||||
| if test "$builtin_vector" = "yes" ; then | if test "$builtin_vector" = "yes" ; then | ||||
| echo "TARGET_BUILTIN_VECTOR=yes" >> config.mak | echo "TARGET_BUILTIN_VECTOR=yes" >> config.mak | ||||
| echo "#define HAVE_BUILTIN_VECTOR 1" >> $TMPH | echo "#define HAVE_BUILTIN_VECTOR 1" >> $TMPH | ||||
| @@ -12,7 +12,8 @@ | |||||
| #ifdef __MINGW32__ | #ifdef __MINGW32__ | ||||
| # undef DATADIR /* clashes with /usr/include/w32api/objidl.h */ | # undef DATADIR /* clashes with /usr/include/w32api/objidl.h */ | ||||
| # include <windows.h> | |||||
| __declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds); | |||||
| // # include <windows.h> | |||||
| # define usleep(t) Sleep((t) / 1000) | # define usleep(t) Sleep((t) / 1000) | ||||
| #endif | #endif | ||||
| @@ -80,7 +80,12 @@ $(LIB): $(OBJS) $(PPOBJS) | |||||
| $(RANLIB) $@ | $(RANLIB) $@ | ||||
| $(SLIB): $(OBJS) | $(SLIB): $(OBJS) | ||||
| $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(AMREXTRALIBS) | |||||
| ifeq ($(TARGET_MINGW32),yes) | |||||
| $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll | |||||
| -lib /machine:i386 /def:$(@:.dll=.def) | |||||
| else | |||||
| $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(AMREXTRALIBS) | |||||
| endif | |||||
| depend: $(SRCS) | depend: $(SRCS) | ||||
| $(CC) -MM $(CFLAGS) $^ 1>.depend | $(CC) -MM $(CFLAGS) $^ 1>.depend | ||||