From patchwork Mon Aug 3 12:46:25 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 30535 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 9F01BB6F2B for ; Mon, 3 Aug 2009 23:54:16 +1000 (EST) Received: from localhost ([127.0.0.1]:47675 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXxzQ-0006tC-LT for incoming@patchwork.ozlabs.org; Mon, 03 Aug 2009 09:54:12 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MXwzG-0003QK-SE for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:49:58 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MXwzC-0003N0-5c for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:49:58 -0400 Received: from [199.232.76.173] (port=51684 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXwzB-0003Mo-UO for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:49:54 -0400 Received: from mx2.redhat.com ([66.187.237.31]:40815) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MXwzB-00071b-AL for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:49:53 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n73Cnqaa006586; Mon, 3 Aug 2009 08:49:52 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n73Cnp19026124; Mon, 3 Aug 2009 08:49:51 -0400 Received: from localhost.localdomain (vpn-12-117.rdu.redhat.com [10.11.12.117]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n73Cn8Mc009715; Mon, 3 Aug 2009 08:49:50 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 3 Aug 2009 14:46:25 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 34/81] move SDL_LIBS Win32 hack to configure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- Makefile.target | 4 ---- configure | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.target b/Makefile.target index d5e38b3..69fb53a 100644 --- a/Makefile.target +++ b/Makefile.target @@ -441,10 +441,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 diff --git a/configure b/configure index 1a3ced7..b704e7f 100755 --- a/configure +++ b/configure @@ -887,6 +887,9 @@ EOF if compile_prog "$sdl_cflags" "$sdl_libs" ; then sdl_libs="$sdl_libs -lX11" fi + if test "$mingw32" = "yes" ; then + sdl_libs="`echo $sdl_libs | sed s/-mwindows//g` -mconsole" + fi fi ##########################################