Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/83866790e13bf5ab8ae41a2dcda3da96ce374071
...commit
http://git.netsurf-browser.org/netsurf.git/commit/83866790e13bf5ab8ae41a2dcda3da96ce374071
...tree
http://git.netsurf-browser.org/netsurf.git/tree/83866790e13bf5ab8ae41a2dcda3da96ce374071
The branch, master has been updated
via 83866790e13bf5ab8ae41a2dcda3da96ce374071 (commit)
via a796b6020c68b9bef20b18ff20a49a8a0189bc45 (commit)
from 45ba2ab2764ab48c9a1e68ef09e68f562af8f7f9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/83866790e13bf5ab8ae41a2dcda3da96ce374071
commit 83866790e13bf5ab8ae41a2dcda3da96ce374071
Merge: a796b60 45ba2ab
Author: Vincent Sanders <vi...@kyllikki.org>
Commit: Vincent Sanders <vi...@kyllikki.org>
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/a796b6020c68b9bef20b18ff20a49a8a0189bc45
commit a796b6020c68b9bef20b18ff20a49a8a0189bc45
Author: Vincent Sanders <vi...@kyllikki.org>
Commit: Vincent Sanders <vi...@kyllikki.org>
fix library link order
diff --git a/windows/Makefile.target b/windows/Makefile.target
index 084726b..e992266 100644
--- a/windows/Makefile.target
+++ b/windows/Makefile.target
@@ -17,9 +17,9 @@
$(eval $(call feature_enabled,MNG,,-llcms -ljpeg,PNG/JNG/MNG (libmng)))
ifneq ($(PKG_CONFIG),)
- CFLAGS += $(shell $(PKG_CONFIG) --cflags libcurl libhubbub zlib \
- libparserutils libdom libwapcaplet libcares libxml-2.0)
- LDFLAGS += $(shell $(PKG_CONFIG) --libs zlib libxml-2.0 libcares libcurl \
+ CFLAGS += $(shell $(PKG_CONFIG) --cflags zlib libcares libcurl libhubbub \
+ libparserutils libdom libwapcaplet libxml-2.0)
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs zlib libxml-2.0 libcurl libcares \
libhubbub libparserutils libcss libdom libwapcaplet)
else
LDFLAGS += -lhubbub -lcss -lparserutils -lwapcaplet -lxml2 -lcurl -lz
-----------------------------------------------------------------------
Summary of changes:
windows/Makefile.target | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/windows/Makefile.target b/windows/Makefile.target
index 084726b..e992266 100644
--- a/windows/Makefile.target
+++ b/windows/Makefile.target
@@ -17,9 +17,9 @@
$(eval $(call feature_enabled,MNG,,-llcms -ljpeg,PNG/JNG/MNG (libmng)))
ifneq ($(PKG_CONFIG),)
- CFLAGS += $(shell $(PKG_CONFIG) --cflags libcurl libhubbub zlib \
- libparserutils libdom libwapcaplet libcares libxml-2.0)
- LDFLAGS += $(shell $(PKG_CONFIG) --libs zlib libxml-2.0 libcares libcurl \
+ CFLAGS += $(shell $(PKG_CONFIG) --cflags zlib libcares libcurl libhubbub \
+ libparserutils libdom libwapcaplet libxml-2.0)
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs zlib libxml-2.0 libcurl libcares \
libhubbub libparserutils libcss libdom libwapcaplet)
else
LDFLAGS += -lhubbub -lcss -lparserutils -lwapcaplet -lxml2 -lcurl -lz
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
netsurf-commits@netsurf-browser.org
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
