From d8cc912a299f742a53934f5ebfdd483e70fea7c4 Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Fri, 4 Feb 2011 15:44:35 +0000
Subject: Slightly saner win32 LDFLAGS for non-pkg-config environments

svn path=/trunk/netsurf/; revision=11609
---
 windows/Makefile.target | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'windows')

diff --git a/windows/Makefile.target b/windows/Makefile.target
index 0249a1b67..3094205a5 100644
--- a/windows/Makefile.target
+++ b/windows/Makefile.target
@@ -2,6 +2,8 @@
 # Windows target setup
 # ----------------------------------------------------------------------------
 
+  LDFLAGS += ${MINGW_INSTALL_ENV}/lib
+
   NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG
   NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE
   NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
@@ -18,10 +20,13 @@
 		libparserutils libxml-2.0)
     LDFLAGS += $(shell $(PKG_CONFIG) --libs zlib libxml-2.0 libcurl \
 		libhubbub libparserutils libcss libwapcaplet)
+  else
+    LDFLAGS += -lhubbub -lcss -lparserutils -lwapcaplet -lxml2 -lcurl -lz
   endif
 
-  LDFLAGS += -L${MINGW_INSTALL_ENV}/lib -lparserutils -lssl -lcrypto -lregex \
-	-liconv -lcss -lwapcaplet -lgdi32 -lcomctl32 -lws2_32 -lmsimg32 -mwindows
+  LDFLAGS += -lssl -lcrypto -lregex -liconv \
+	     -lgdi32 -lcomctl32 -lws2_32 -lmsimg32 -mwindows
+
   CFLAGS += -U__STRICT_ANSI__ -mwin32
   # only windows versions after 2000 are supported
   CFLAGS += '-DWINVER=0x0500'
-- 
cgit v1.2.3