diff options
author | James Bursa <james@netsurf-browser.org> | 2008-08-12 03:49:34 +0000 |
---|---|---|
committer | James Bursa <james@netsurf-browser.org> | 2008-08-12 03:49:34 +0000 |
commit | 33107b160f09bbb301791759b83d772c820c4813 (patch) | |
tree | 2b0a0293ddcc63a44a2d01421db1e3286aa5f753 /Makefile | |
parent | 4c8989a6db25de8b2d3bf7fff07489c05808122b (diff) | |
download | netsurf-33107b160f09bbb301791759b83d772c820c4813.tar.gz netsurf-33107b160f09bbb301791759b83d772c820c4813.tar.bz2 |
Merged revisions 4345-4346,4350-4351,4389,4391,4395,4401-4403,4423,4485-4486 via svnmerge from
svn://semichrome.net/branches/dynis/netsurf
........
r4345 | dynis | 2008-06-15 18:37:23 -0500 (Sun, 15 Jun 2008) | 1 line
Move NetSurf's gifread.h to libnsgif
........
r4346 | dynis | 2008-06-15 18:38:38 -0500 (Sun, 15 Jun 2008) | 1 line
Remove NetSurf's gifread.c (replaced by libnsgif)
........
r4350 | dynis | 2008-06-15 18:57:17 -0500 (Sun, 15 Jun 2008) | 1 line
Added references to libnsgif where necessary; corrected function calls where callbacks were implemented
........
r4351 | dynis | 2008-06-15 19:00:33 -0500 (Sun, 15 Jun 2008) | 1 line
Updated Makefile to compile with libnsgif
........
r4389 | dynis | 2008-06-18 13:58:51 -0500 (Wed, 18 Jun 2008) | 1 line
Altered bitmap callback table name for gif images to avoid ambiguity when bmp image library is created
........
r4391 | dynis | 2008-06-18 14:08:39 -0500 (Wed, 18 Jun 2008) | 1 line
Updated netsurf branch to use new bitmap callback table structure name that was altered in libnsgif
........
r4395 | dynis | 2008-06-18 14:54:51 -0500 (Wed, 18 Jun 2008) | 1 line
Corrected param comments for bitmap_set_suspendable()
........
r4401 | dynis | 2008-06-18 18:39:50 -0500 (Wed, 18 Jun 2008) | 1 line
Added references to libnsbmp where necessary; corrected function calls where callbacks were implemented
........
r4402 | dynis | 2008-06-18 18:40:47 -0500 (Wed, 18 Jun 2008) | 1 line
Updated Makefile to compile with libnsbmp
........
r4403 | dynis | 2008-06-18 18:41:53 -0500 (Wed, 18 Jun 2008) | 1 line
Remove NetSurf's bmpread.c and bmpread.h (replaced by libnsbmp)
........
r4423 | dynis | 2008-06-22 14:21:30 -0500 (Sun, 22 Jun 2008) | 1 line
Correct a silly mistake in nsbmp_bitmap_create
........
r4485 | dynis | 2008-07-01 04:13:48 -0500 (Tue, 01 Jul 2008) | 1 line
Integrated the latest versions of libnsgif and libnsbmp into NetSurf
........
r4486 | dynis | 2008-07-01 05:27:10 -0500 (Tue, 01 Jul 2008) | 1 line
Altered bitmap functions to receive void pointers for proper utilisation of libnsgif and libnsbmp
........
svn path=/trunk/netsurf/; revision=5071
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -209,7 +209,7 @@ define pkg_config_find_and_add $$(info M.CONFIG: auto-enabled $(3) ($(2)).) endif else - $$(error Unable to find library for: $(3) ($(2)) + $$(error Unable to find library for: $(3) ($(2))) endif endif else @@ -220,8 +220,8 @@ define pkg_config_find_and_add endef -$(eval $(call feature_enabled,BMP,-DWITH_BMP,,BMP support)) -$(eval $(call feature_enabled,GIF,-DWITH_GIF,,GIF support)) +$(eval $(call feature_enabled,BMP,-DWITH_BMP,-lnsbmp,BMP support)) +$(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif,GIF support)) $(eval $(call feature_enabled,JPEG,-DWITH_JPEG,-ljpeg,JPEG support)) $(eval $(call feature_enabled,MNG,-DWITH_MNG,-lmng,PNG support)) @@ -295,9 +295,10 @@ ifeq ($(TARGET),gtk) -DGTK_RESPATH=\"$(NETSURF_GTK_RESOURCES)\" \ $(WARNFLAGS) -I. -g $(OPT2FLAGS) \ $(shell $(PKG_CONFIG) --cflags libglade-2.0 gtk+-2.0) \ + $(shell $(PKG_CONFIG) --cflags libnsgif libnsbmp) \ $(shell xml2-config --cflags) - GTKLDFLAGS := $(shell $(PKG_CONFIG) --cflags --libs libglade-2.0 gtk+-2.0 gthread-2.0 gmodule-2.0 lcms) + GTKLDFLAGS := $(shell $(PKG_CONFIG) --cflags --libs libglade-2.0 gtk+-2.0 gthread-2.0 gmodule-2.0 lcms libnsgif libnsbmp) CFLAGS += $(GTKCFLAGS) LDFLAGS += $(GTKLDFLAGS) @@ -414,6 +415,7 @@ ifeq ($(TARGET),debug) -D_POSIX_C_SOURCE=200112L \ -D_NETBSD_SOURCE \ $(WARNFLAGS) -I. -g $(OPT0FLAGS) \ + $(shell $(PKG_CONFIG) --cflags libnsgif libnsbmp) \ $(shell xml2-config --cflags) LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl openssl) @@ -421,6 +423,7 @@ ifeq ($(TARGET),debug) $(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,RISC OS sprite rendering)) $(eval $(call pkg_config_find_and_add,HUBBUB,libhubbub,Hubbub HTML parser)) $(eval $(call pkg_config_find_and_add,HUBBUB,libparserutils,Hubbub HTML parser)) +LDFLAGS += $(shell $(PKG_CONFIG) --libs libnsgif libnsbmp) endif # ---------------------------------------------------------------------------- |