[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 36/37] fold SDL_LIBS on generic LIBS
From: |
quintela |
Subject: |
[Qemu-devel] [PATCH 36/37] fold SDL_LIBS on generic LIBS |
Date: |
Fri, 17 Jul 2009 21:21:29 +0200 |
From: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
Makefile.target | 5 -----
configure | 8 +++++---
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 8883ab9..8621c76 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -576,10 +576,6 @@ ifeq ($(ARCH),ia64)
LDFLAGS+=-Wl,-G0 -Wl,-T,$(SRC_PATH)/ia64.ld
endif
-ifdef CONFIG_WIN32
-SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole
-endif
-
# profiling code
ifdef TARGET_GPROF
LDFLAGS+=-p
@@ -592,7 +588,6 @@ vl.o: qemu-options.h
monitor.o: qemu-monitor.h
-LIBS += $(SDL_LIBS)
ARLIBS=../libqemu_common.a libqemu.a $(HWLIB)
endif # !CONFIG_USER_ONLY
diff --git a/configure b/configure
index d95054f..6f8abb0 100755
--- a/configure
+++ b/configure
@@ -1677,11 +1677,13 @@ if test "$sdl1" = "yes" ; then
echo "#define CONFIG_SDL 1" >> $config_host_h
echo "CONFIG_SDL=y" >> $config_host_mak
if test "$target_softmmu" = "no" -o "$static" = "yes"; then
- echo "SDL_LIBS=$sdl_static_libs" >> $config_host_mak
+ LIBS="$LIBS $sdl_static_libs"
elif test "$sdl_x11" = "yes" ; then
- echo "SDL_LIBS=`$sdl_config --libs` -lX11" >> $config_host_mak
+ LIBS="$LIBS `$sdl_config --libs` -lX11"
+ elif test "$mingw32" = "yes" ; then
+ LIBS="$LIBS `$sdl_config --libs | sed s/-mwindows//g` -mconsole"
else
- echo "SDL_LIBS=`$sdl_config --libs`" >> $config_host_mak
+ LIBS="$LIBS `$sdl_config --libs`"
fi
if [ "${aa}" = "yes" ] ; then
echo "SDL_CFLAGS=`$sdl_config --cflags` `aalib-config --cflags`" >>
$config_host_mak
--
1.6.2.5
- [Qemu-devel] [PATCH 27/37] fold FDT_LIBS on generic LIBS, (continued)
- [Qemu-devel] [PATCH 27/37] fold FDT_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 26/37] Refactor code to remove one #ifdef CONFIG_FDT, quintela, 2009/07/17
- [Qemu-devel] [PATCH 28/37] fold NEEDS_LIBSUNMATH on generic variables, quintela, 2009/07/17
- [Qemu-devel] [PATCH 32/37] fold DSOUND libs on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 31/37] fold ALSA libs on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 30/37] fold OSS_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 29/37] fold FMOD_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 33/37] fold Pulse Audio libs on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 34/37] fold ESD libs on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 35/37] fold COCOA_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 36/37] fold SDL_LIBS on generic LIBS,
quintela <=
- [Qemu-devel] [PATCH 37/37] remove rt variable, we can assign directly LIBS, quintela, 2009/07/17
- Re: [Qemu-devel] [PATCH 00/37] Generate a proper LIBS variable, Blue Swirl, 2009/07/17
- Re: [Qemu-devel] [PATCH 00/37] Generate a proper LIBS variable, Anthony Liguori, 2009/07/22
- [Qemu-devel] Re: [PATCH 00/37] Generate a proper LIBS variable, Paolo Bonzini, 2009/07/22
- [Qemu-devel] Re: [PATCH 00/37] Generate a proper LIBS variable, Juan Quintela, 2009/07/22
- [Qemu-devel] Re: [PATCH 00/37] Generate a proper LIBS variable, Anthony Liguori, 2009/07/22
- [Qemu-devel] Re: [PATCH 00/37] Generate a proper LIBS variable, Juan Quintela, 2009/07/22
- [Qemu-devel] Re: [PATCH 00/37] Generate a proper LIBS variable, Anthony Liguori, 2009/07/22
- Re: [Qemu-devel] Re: [PATCH 00/37] Generate a proper LIBS variable, Paul Brook, 2009/07/22