MingW patches by (Glenn Maynard <g_sf at zewt dot org>)
Originally committed as revision 2203 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
dafc3856d9
commit
a17236c53c
7
configure
vendored
7
configure
vendored
@ -191,6 +191,10 @@ dv1394="no"
|
||||
ffserver="no"
|
||||
network="no"
|
||||
mingw32="yes"
|
||||
LIBPREF=""
|
||||
LIBSUF=".lib"
|
||||
SLIBPREF=""
|
||||
SLIBSUF=".dll"
|
||||
;;
|
||||
CYGWIN*)
|
||||
v4l="no"
|
||||
@ -885,6 +889,9 @@ if test "$mmx" = "yes" ; then
|
||||
echo "#define HAVE_MMX 1" >> $TMPH
|
||||
echo "#define __CPU__ 586" >> $TMPH
|
||||
fi
|
||||
if test "$mingw32" = "yes" ; then
|
||||
echo "TARGET_MINGW32=yes" >> config.mak
|
||||
fi
|
||||
if test "$builtin_vector" = "yes" ; then
|
||||
echo "TARGET_BUILTIN_VECTOR=yes" >> config.mak
|
||||
echo "#define HAVE_BUILTIN_VECTOR 1" >> $TMPH
|
||||
|
@ -12,7 +12,8 @@
|
||||
|
||||
#ifdef __MINGW32__
|
||||
# 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)
|
||||
#endif
|
||||
|
||||
|
@ -80,7 +80,12 @@ $(LIB): $(OBJS) $(PPOBJS)
|
||||
$(RANLIB) $@
|
||||
|
||||
$(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)
|
||||
$(CC) -MM $(CFLAGS) $^ 1>.depend
|
||||
|
Loading…
x
Reference in New Issue
Block a user