Move to configure CONFIG_WIN32 libraries needed always
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Message-Id:
This commit is contained in:
parent
e174c0bb9a
commit
884044aab1
4
Makefile
4
Makefile
|
@ -27,10 +27,6 @@ else
|
||||||
DOCS=
|
DOCS=
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef CONFIG_WIN32
|
|
||||||
LIBS+=-lwinmm -lws2_32 -liphlpapi
|
|
||||||
endif
|
|
||||||
|
|
||||||
build-all: $(TOOLS) $(DOCS) recurse-all
|
build-all: $(TOOLS) $(DOCS) recurse-all
|
||||||
|
|
||||||
config-host.mak: configure
|
config-host.mak: configure
|
||||||
|
|
|
@ -48,9 +48,6 @@ endif
|
||||||
CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
|
CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
|
||||||
CPPFLAGS+=-U_FORTIFY_SOURCE
|
CPPFLAGS+=-U_FORTIFY_SOURCE
|
||||||
LIBS+=-lm
|
LIBS+=-lm
|
||||||
ifdef CONFIG_WIN32
|
|
||||||
LIBS+=-lwinmm -lws2_32 -liphlpapi
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_SOLARIS
|
ifdef CONFIG_SOLARIS
|
||||||
ifdef CONFIG_NEEDS_LIBSUNMATH
|
ifdef CONFIG_NEEDS_LIBSUNMATH
|
||||||
LIBS+=-lsunmath
|
LIBS+=-lsunmath
|
||||||
|
|
|
@ -355,6 +355,7 @@ if test "$mingw32" = "yes" ; then
|
||||||
fi
|
fi
|
||||||
EXESUF=".exe"
|
EXESUF=".exe"
|
||||||
CFLAGS="-DWIN32_LEAN_AND_MEAN -DWINVER=0x501 $CFLAGS"
|
CFLAGS="-DWIN32_LEAN_AND_MEAN -DWINVER=0x501 $CFLAGS"
|
||||||
|
LIBS="-lwinmm -lws2_32 -liphlpapi $LIBS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# find source path
|
# find source path
|
||||||
|
|
Loading…
Reference in New Issue