diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-08 16:54:18 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-09 21:41:11 -0300 |
| commit | fde3bb16f90ac456709c7305b9e230e8327d8625 (patch) | |
| tree | 7d374e6004af60cb3936b8e47c8ab8da9c8436bb | |
| parent | 217a723b4e0573129c4ec9c31ca3ee666a2a64f6 (diff) | |
| download | ffmpeg-streaming-fde3bb16f90ac456709c7305b9e230e8327d8625.zip ffmpeg-streaming-fde3bb16f90ac456709c7305b9e230e8327d8625.tar.gz | |
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>
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | ffbuild/library.mak | 1 |
2 files changed, 2 insertions, 3 deletions
@@ -6108,10 +6108,10 @@ if enabled sdl2; then enable sdl2 fi if test $target_os = "mingw32"; then - sdl2_extralibs="$sdl2_extralibs -mconsole" + sdl2_extralibs=$(filter_out '-mwindows' $sdl2_extralibs) fi fi -enabled sdl2 && add_cflags $sdl2_cflags && add_extralibs $sdl2_extralibs +enabled sdl2 && add_cflags $(filter_out '-Dmain=SDL_main' $sdl2_cflags) && add_extralibs $sdl2_extralibs if enabled decklink; then case $target_os in diff --git a/ffbuild/library.mak b/ffbuild/library.mak index ee19c3c..4191edc 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) $@ |
