diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2011-01-23 00:39:53 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-01-23 00:39:53 +0000 |
commit | 4976247df07f87c3f61e21d769925d1e7d964b90 (patch) | |
tree | 2ae9f25c6f99b68874118d2fdbe848858f071af4 /windows/Makefile.target | |
parent | c873d789dc198e2c48c97803ef21e22dcc3fb39b (diff) | |
download | netsurf-4976247df07f87c3f61e21d769925d1e7d964b90.tar.gz netsurf-4976247df07f87c3f61e21d769925d1e7d964b90.tar.bz2 |
Cope with an absence of pkg-config when building for Windows
svn path=/trunk/netsurf/; revision=11459
Diffstat (limited to 'windows/Makefile.target')
-rw-r--r-- | windows/Makefile.target | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/windows/Makefile.target b/windows/Makefile.target index 7b931eeee..ce81ca1cb 100644 --- a/windows/Makefile.target +++ b/windows/Makefile.target @@ -13,18 +13,21 @@ $(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny))) $(eval $(call feature_enabled,MNG,,-llcms -ljpeg,PNG/JNG/MNG (libmng))) - LDFLAGS += -L${MINGW_INSTALL_ENV}/lib $(shell $(PKG_CONFIG) --libs zlib \ - libxml-2.0 libcurl libhubbub libparserutils libcss libwapcaplet) \ - -lparserutils -lssl -lcrypto -lregex -liconv -lcss -lwapcaplet \ - -lgdi32 -lcomctl32 -lws2_32 -lmsimg32 -mwindows + ifneq ($(PKG_CONFIG),) + CFLAGS += $(shell $(PKG_CONFIG) --cflags libcurl libhubbub zlib \ + libparserutils libxml-2.0) + LDFLAGS += $(shell $(PKG_CONFIG) --libs zlib libxml-2.0 libcurl \ + libhubbub libparserutils libcss libwapcaplet) + endif + + LDFLAGS += -L${MINGW_INSTALL_ENV}/lib -lparserutils -lssl -lcrypto -lregex \ + -liconv -lcss -lwapcaplet -lgdi32 -lcomctl32 -lws2_32 -lmsimg32 -mwindows CFLAGS += -U__STRICT_ANSI__ -mwin32 # only windows versions after 2000 are supported CFLAGS += '-DWINVER=0x0500' WSCFLAGS := -std=c99 \ $(WARNFLAGS) -I. -I/${MINGW_INSTALL_ENV}/include \ - -DCURL_STATICLIB \ - $(shell $(PKG_CONFIG) --cflags libcurl libhubbub zlib libparserutils \ - libxml-2.0) -g + -DCURL_STATICLIB -g CFLAGS += $(WSCFLAGS) LDFLAGS += $(WSCFLAGS) |