Commit 8ecc89f6 authored Sep 07, 2017 by Fam Zheng

buildsys: Move sdl cflags/libs to per object



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>

parent e2ad6f16

audio/Makefile.objs

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,3 +11,4 @@ common-obj-$(CONFIG_AUDIO_WIN_INT) += audio_win_int.o
		common-obj-y += wavcapture.o

		sdlaudio.o-cflags := $(SDL_CFLAGS)
		sdlaudio.o-libs := $(SDL_LIBS)

configure

+1 −1

Original line number	Diff line number	Diff line
		@@ -2788,7 +2788,6 @@ EOF
		sdl_cflags="$sdl_cflags $x11_cflags"
		sdl_libs="$sdl_libs $x11_libs"
		fi
		libs_softmmu="$sdl_libs $libs_softmmu"
		fi

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

ui/Makefile.objs

+1 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ sdl.mo-objs += sdl2-gl.o
		endif
		endif
		sdl.mo-cflags := $(SDL_CFLAGS)
		sdl.mo-libs := $(SDL_LIBS)

		ifeq ($(CONFIG_OPENGL),y)
		common-obj-y += shader.o