diff options
| author | James Almer <jamrial@gmail.com> | 2015-06-19 12:11:16 +0200 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2015-06-26 16:22:54 -0300 |
| commit | 459090181fe53cea5cf43982b363d8a98fc60a50 (patch) | |
| tree | 854740ca048fa91b915d89ec12252b58164a4cd5 | |
| parent | 071d7f4e179a18a403063c57f92664e8079def09 (diff) | |
| download | ffmpeg-459090181fe53cea5cf43982b363d8a98fc60a50.tar.gz | |
library.mak: Workaround SDL redefining main and breaking fate tests on mingw
Fixes Ticket3368
Commit message by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a9af9da6311b4ba50abe55d14d42a4d4818e83d8)
| -rw-r--r-- | library.mak | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/library.mak b/library.mak index 7c260245a4..29460b8e75 100644 --- a/library.mak +++ b/library.mak @@ -34,6 +34,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): CPPFLAGS += -DTEST +$(TESTOBJS) $(TESTOBJS:.o=.i): CFLAGS += -Umain $(SUBDIR)$(LIBNAME): $(OBJS) $(RM) $@ |