mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildsys: Move sdl cflags/libs to per object

Browse Source 
Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <20170907082918.7299-3-famz@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Fam Zheng <famz@redhat.com>
This commit is contained in:
Fam Zheng 2017-09-07 16:29:11 +08:00
parent e2ad6f16a8
commit 8ecc89f6e7
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
audio/Makefile.objs
View File

@ -11,3 +11,4 @@ common-obj-$(CONFIG_AUDIO_WIN_INT) += audio_win_int.o
common-obj-y += wavcapture.o common-obj-y += wavcapture.o
sdlaudio.o-cflags := $(SDL_CFLAGS) sdlaudio.o-cflags := $(SDL_CFLAGS)
sdlaudio.o-libs := $(SDL_LIBS)

2
configure vendored
View File

@ -2788,7 +2788,6 @@ EOF
sdl_cflags="$sdl_cflags $x11_cflags" sdl_cflags="$sdl_cflags $x11_cflags"
sdl_libs="$sdl_libs $x11_libs" sdl_libs="$sdl_libs $x11_libs"
fi fi
libs_softmmu="$sdl_libs $libs_softmmu"
fi fi
########################################## ##########################################
@ -5557,6 +5556,7 @@ if test "$sdl" = "yes" ; then
echo "CONFIG_SDL=y" >> $config_host_mak echo "CONFIG_SDL=y" >> $config_host_mak
echo "CONFIG_SDLABI=$sdlabi" >> $config_host_mak echo "CONFIG_SDLABI=$sdlabi" >> $config_host_mak
echo "SDL_CFLAGS=$sdl_cflags" >> $config_host_mak echo "SDL_CFLAGS=$sdl_cflags" >> $config_host_mak
echo "SDL_LIBS=$sdl_libs" >> $config_host_mak
fi fi
if test "$cocoa" = "yes" ; then if test "$cocoa" = "yes" ; then
echo "CONFIG_COCOA=y" >> $config_host_mak echo "CONFIG_COCOA=y" >> $config_host_mak

1
ui/Makefile.objs
View File

@ -27,6 +27,7 @@ sdl.mo-objs += sdl2-gl.o
endif endif
endif endif
sdl.mo-cflags := $(SDL_CFLAGS) sdl.mo-cflags := $(SDL_CFLAGS)
sdl.mo-libs := $(SDL_LIBS)
ifeq ($(CONFIG_OPENGL),y) ifeq ($(CONFIG_OPENGL),y)
common-obj-y += shader.o common-obj-y += shader.o