mirror of https://git.ffmpeg.org/ffmpeg.git
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>
This commit is contained in:
parent
217a723b4e
commit
fde3bb16f9
|
@ -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
|
||||
|
|
|
@ -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) $@
|
||||
|
|
Loading…
Reference in New Issue