[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/9] buildsys: Move sdl cflags/libs to per object
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH 2/9] buildsys: Move sdl cflags/libs to per object |
Date: |
Thu, 7 Sep 2017 16:29:11 +0800 |
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 e27a4bd683..812a1ce615 100755
--- a/configure
+++ b/configure
@@ -2794,7 +2794,6 @@ EOF
sdl_cflags="$sdl_cflags $x11_cflags"
sdl_libs="$sdl_libs $x11_libs"
fi
- libs_softmmu="$sdl_libs $libs_softmmu"
fi
##########################################
@@ -5593,6 +5592,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 146a8ce062..b3e29e21f0 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] [PATCH 0/9] buildsys: Move ui/usb library cflags/libs to per object, Fam Zheng, 2017/09/07
- [Qemu-devel] [PATCH 1/9] buildsys: Move gtk/vte cflags/libs to per object, Fam Zheng, 2017/09/07
- [Qemu-devel] [PATCH 2/9] buildsys: Move sdl cflags/libs to per object,
Fam Zheng <=
- [Qemu-devel] [PATCH 3/9] buildsys: Move vnc cflags/libs to per object, Fam Zheng, 2017/09/07
- [Qemu-devel] [PATCH 4/9] buildsys: Move audio libs to per object, Fam Zheng, 2017/09/07
- [Qemu-devel] [PATCH 5/9] buildsys: Move curese cflags/libs to per object, Fam Zheng, 2017/09/07
- [Qemu-devel] [PATCH 8/9] buildsys: Move libusb cflags/libs to per object, Fam Zheng, 2017/09/07
- [Qemu-devel] [PATCH 6/9] buildsys: Move opengl cflags to per object, Fam Zheng, 2017/09/07
- [Qemu-devel] [PATCH 7/9] buildsys: Move libcacard cflags/libs to per object, Fam Zheng, 2017/09/07
- [Qemu-devel] [PATCH 9/9] buildsys: Move usb redir cflags/libs to per object, Fam Zheng, 2017/09/07
- Re: [Qemu-devel] [PATCH 0/9] buildsys: Move ui/usb library cflags/libs to per object, Gerd Hoffmann, 2017/09/07