[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/36] buildsys: Move sdl cflags/libs to per object
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 15/36] buildsys: Move sdl cflags/libs to per object |
Date: |
Fri, 22 Sep 2017 15:46:38 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
---
audio/Makefile.objs | 1 +
configure | 2 +-
ui/Makefile.objs | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
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)
diff --git a/configure b/configure
index 956ab367dc..3675ae816e 100755
--- a/configure
+++ b/configure
@@ -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
--
2.13.5
- [Qemu-devel] [PULL 04/36] docker: reduce noise when building travis.docker, (continued)
- [Qemu-devel] [PULL 04/36] docker: reduce noise when building travis.docker, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 06/36] docker: Enable features explicitly in test-full, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 05/36] docker: Update ubuntu image, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 07/36] tests/docker: Clean up paths, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 08/36] docker: Fix return code of build_qemu(), Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 09/36] docker: Add test_fail and prep_fail, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 10/36] docker: Use unconfined security profile, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 11/36] docker: Add nettle-devel to fedora image, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 12/36] docker: Add test-block, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 13/36] vl: Don't include vde header, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 15/36] buildsys: Move sdl cflags/libs to per object,
Fam Zheng <=
- [Qemu-devel] [PULL 14/36] buildsys: Move vde libs to per object, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 16/36] buildsys: Move audio libs to per object, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 17/36] buildsys: Move libcacard cflags/libs to per object, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 18/36] buildsys: Move libusb cflags/libs to per object, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 19/36] buildsys: Move usb redir cflags/libs to per object, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 20/36] buildsys: Move brlapi libs to per object, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 21/36] buildsys: Move rdma libs to per object, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 22/36] MAINTAINERS: Fix subsystem name for "Build and test automation", Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 23/36] gitignore: Ignore vm test images, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 24/36] qemu.py: Add "wait()" method, Fam Zheng, 2017/09/22