diff options
| author | Fam Zheng <famz@redhat.com> | 2017-09-07 16:29:11 +0800 |
|---|---|---|
| committer | Fam Zheng <famz@redhat.com> | 2017-09-22 10:20:34 +0800 |
| commit | 8ecc89f6e792152496eccb684d6c8c48aba8027d (patch) | |
| tree | 8e0823ec66c1d1bb7449ee940a8746ef16559092 | |
| parent | e2ad6f16a88031cb85c5409fb158e15dac966f80 (diff) | |
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>
| -rw-r--r-- | audio/Makefile.objs | 1 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | ui/Makefile.objs | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/audio/Makefile.objs b/audio/Makefile.objs index 481d1aa30e..c20695668f 100644 --- a/audio/Makefile.objs +++ b/audio/Makefile.objs @@ -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) @@ -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 diff --git a/ui/Makefile.objs b/ui/Makefile.objs index 3369451285..ec8533d6d9 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -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 |