Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-10-08 22:54:18 +0300
committerJames Almer <jamrial@gmail.com>2017-10-10 03:41:11 +0300
commitfde3bb16f90ac456709c7305b9e230e8327d8625 (patch)
tree7d374e6004af60cb3936b8e47c8ab8da9c8436bb /ffbuild
parent217a723b4e0573129c4ec9c31ca3ee666a2a64f6 (diff)
build: prevent SDL2 from polluting global cflags and extralibs
Remove the SDL_main define from the global cflags but not from the ffplay cflags, and the -mwindows linker option from extralibs instead of overriding it with the addition of -mconsole. Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'ffbuild')
-rw-r--r--ffbuild/library.mak1
1 files changed, 0 insertions, 1 deletions
diff --git a/ffbuild/library.mak b/ffbuild/library.mak
index ee19c3c797..4191edcf9c 100644
--- a/ffbuild/library.mak
+++ b/ffbuild/library.mak
@@ -16,7 +16,6 @@ all-$(CONFIG_SHARED): $(SUBDIR)$(SLIBNAME) $(SUBDIR)lib$(FULLNAME).pc
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) $@