[FFmpeg-cvslog] library.mak: Put -Umain back for tests

Michael Niedermayer git at videolan.org
Wed Jun 1 16:34:24 CEST 2016


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Jun  1 16:22:36 2016 +0200| [77ba4a784302d61eaf89e640f17e6b6ab5ac8fa6] | committer: Michael Niedermayer

library.mak: Put -Umain back for tests

Fixes build on mingw32 with SDL

reverts one line from 96d616052b3d39678e477fa10610ca688f46fff9

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=77ba4a784302d61eaf89e640f17e6b6ab5ac8fa6
---

 library.mak |    1 +
 1 file changed, 1 insertion(+)

diff --git a/library.mak b/library.mak
index cc4b498..5bfa796 100644
--- a/library.mak
+++ b/library.mak
@@ -21,6 +21,7 @@ $(SUBDIR)x86/%.o: $(SUBDIR)x86/%$(YASMD).asm
 
 LIBOBJS := $(OBJS) $(SUBDIR)%.h.o $(TESTOBJS)
 $(LIBOBJS) $(LIBOBJS:.o=.s) $(LIBOBJS:.o=.i):   CPPFLAGS += -DHAVE_AV_CONFIG_H
+$(TESTOBJS) $(TESTOBJS:.o=.i): CFLAGS += -Umain
 
 $(SUBDIR)$(LIBNAME): $(OBJS)
 	$(RM) $@



More information about the ffmpeg-cvslog mailing list