[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 28/42] Move to configure CONFIG_WIN32 libraries need
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 28/42] Move to configure CONFIG_WIN32 libraries needed always |
Date: |
Thu, 30 Jul 2009 04:07:23 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
Makefile | 4 ----
Makefile.target | 3 ---
configure | 1 +
3 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index d662e48..dc85d01 100644
--- a/Makefile
+++ b/Makefile
@@ -27,10 +27,6 @@ else
DOCS=
endif
-ifdef CONFIG_WIN32
-LIBS+=-lwinmm -lws2_32 -liphlpapi
-endif
-
build-all: $(TOOLS) $(DOCS) roms recurse-all
config-host.mak: configure
diff --git a/Makefile.target b/Makefile.target
index b77c496..fdcf480 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -48,9 +48,6 @@ endif
CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
CPPFLAGS+=-U_FORTIFY_SOURCE
LIBS+=-lm
-ifdef CONFIG_WIN32
-LIBS+=-lwinmm -lws2_32 -liphlpapi
-endif
ifdef CONFIG_SOLARIS
ifdef CONFIG_NEEDS_LIBSUNMATH
LIBS+=-lsunmath
diff --git a/configure b/configure
index bf93f4d..1babbaf 100755
--- a/configure
+++ b/configure
@@ -355,6 +355,7 @@ if test "$mingw32" = "yes" ; then
fi
EXESUF=".exe"
CFLAGS="-DWIN32_LEAN_AND_MEAN -DWINVER=0x501 $CFLAGS"
+ LIBS="-lwinmm -lws2_32 -liphlpapi $LIBS"
fi
# find source path
--
1.6.2.5
- [Qemu-devel] [PATCH 17/42] This variables can't be set here, (continued)
- [Qemu-devel] [PATCH 17/42] This variables can't be set here, Juan Quintela, 2009/07/29
- [Qemu-devel] [PATCH 19/42] move sparc_cpu arg parsing to the begining, Juan Quintela, 2009/07/29
- [Qemu-devel] [PATCH 20/42] refactor sparc_cpu code to be in a single place, Juan Quintela, 2009/07/29
- [Qemu-devel] [PATCH 22/42] reindent Operating System selection configure, Juan Quintela, 2009/07/29
- [Qemu-devel] [PATCH 23/42] We use -lz for all binaries, Juan Quintela, 2009/07/29
- [Qemu-devel] [PATCH 24/42] We want to pass LIB through configuration files now, Juan Quintela, 2009/07/29
- [Qemu-devel] [PATCH 21/42] refactor $cpu selection in various places, Juan Quintela, 2009/07/29
- [Qemu-devel] [PATCH 25/42] PTHREADLIBS was used for all binaries, Juan Quintela, 2009/07/29
- [Qemu-devel] [PATCH 26/42] CLOCKLIBS was used for all binaries, Juan Quintela, 2009/07/29
- [Qemu-devel] [PATCH 27/42] Move to configure CONFIG_SOLARIS libraries needed always, Juan Quintela, 2009/07/29
- [Qemu-devel] [PATCH 28/42] Move to configure CONFIG_WIN32 libraries needed always,
Juan Quintela <=
- [Qemu-devel] [PATCH 29/42] We set -Werror through configure now, Juan Quintela, 2009/07/29
- [Qemu-devel] [PATCH 30/42] Rename CPPFLAGS to CFLAGS, Juan Quintela, 2009/07/29
- [Qemu-devel] Re: [PATCH 30/42] Rename CPPFLAGS to CFLAGS, Paolo Bonzini, 2009/07/30
- [Qemu-devel] Re: [PATCH 30/42] Rename CPPFLAGS to CFLAGS, Juan Quintela, 2009/07/30
- [Qemu-devel] Re: [PATCH 30/42] Rename CPPFLAGS to CFLAGS, Paolo Bonzini, 2009/07/30
- [Qemu-devel] Re: [PATCH 30/42] Rename CPPFLAGS to CFLAGS, Juan Quintela, 2009/07/30
- [Qemu-devel] Re: [PATCH 30/42] Rename CPPFLAGS to CFLAGS, Paolo Bonzini, 2009/07/30
- [Qemu-devel] Re: [PATCH 30/42] Rename CPPFLAGS to CFLAGS, Juan Quintela, 2009/07/30
- Re: [Qemu-devel] Re: [PATCH 30/42] Rename CPPFLAGS to CFLAGS, Jamie Lokier, 2009/07/30
- [Qemu-devel] Re: [PATCH 30/42] Rename CPPFLAGS to CFLAGS, Juan Quintela, 2009/07/30