summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorVincent Sanders <vince@netsurf-browser.org>2009-06-28 18:32:47 +0000
committerVincent Sanders <vince@netsurf-browser.org>2009-06-28 18:32:47 +0000
commit36b5deef09d0390e6d1a7bac9362bb8bc0008b0b (patch)
tree6651d5abb5ee71da281481acce7fcc36b3bae00c /Makefile
parentd570a80b59361ebfb8ef9ba4e64f1f74bff18855 (diff)
downloadnetsurf-36b5deef09d0390e6d1a7bac9362bb8bc0008b0b.tar.gz
netsurf-36b5deef09d0390e6d1a7bac9362bb8bc0008b0b.tar.bz2
Make framebuffer port use libnsfb
svn path=/trunk/netsurf/; revision=8122
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile111
1 files changed, 18 insertions, 93 deletions
diff --git a/Makefile b/Makefile
index 6d214ce1b..200c1ae3b 100644
--- a/Makefile
+++ b/Makefile
@@ -473,115 +473,40 @@ endif
# ----------------------------------------------------------------------------
ifeq ($(TARGET),framebuffer)
+
$(eval $(call feature_enabled,MNG,-DWITH_MNG,-lmng,PNG support))
$(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG support))
+
ifeq ($(NETSURF_FB_FONTLIB),freetype)
- CFLAGS += -DFB_USE_FREETYPE $(shell freetype-config --cflags)
- LDFLAGS += $(shell freetype-config --libs)
+ CFLAGS += -DFB_USE_FREETYPE $(shell freetype-config --cflags)
+ LDFLAGS += $(shell freetype-config --libs)
endif
# define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here
NETSURF_FEATURE_RSVG_CFLAGS := -DWITH_RSVG
NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE
+ NETSURF_FEATURE_HUBBUB_CFLAGS := -DWITH_HUBBUB
NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
- CFLAGS += '-DNETSURF_FB_RESPATH="$(NETSURF_FB_RESPATH_$(NETSURF_FB_FRONTEND))"'
- CFLAGS += -Dnsfb
-
- ifeq ($(NETSURF_FB_FRONTEND),linux)
- $(eval $(call pkg_config_find_and_add,RSVG,librsvg-2.0,SVG rendering))
- $(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,RISC OS sprite rendering))
- $(eval $(call pkg_config_find_and_add,BMP,libnsbmp,NetSurf BMP decoder))
- $(eval $(call pkg_config_find_and_add,GIF,libnsgif,NetSurf GIF decoder))
-
-
- CFLAGS += -std=c99 -g -I. -Dsmall $(WARNFLAGS) \
- $(shell $(PKG_CONFIG) --cflags libhubbub libcurl openssl) \
- $(shell xml2-config --cflags) \
- -D_BSD_SOURCE \
- -D_XOPEN_SOURCE=600 \
- -D_POSIX_C_SOURCE=200112L
-
- LDFLAGS += -lxml2 -lz -ljpeg -lcurl -lm
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl libhubbub openssl)
- SUBTARGET := -linux
- endif
-
- ifeq ($(NETSURF_FB_FRONTEND),able)
- $(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif,NetSurf GIF decoder))
- CC=arm-able-gcc
- CFLAGS += -std=c99 -I. -I/usr/lib/able/include -Dsmall $(WARNFLAGS)
- LDFLAGS += -lxml2 -lz -ljpeg -lcurl -lm -lhubbub -lparserutils
- SUBTARGET := -able
- endif
-
- ifeq ($(NETSURF_FB_FRONTEND),dummy)
- $(eval $(call pkg_config_find_and_add,RSVG,librsvg-2.0,SVG rendering))
- $(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,RISC OS sprite rendering))
- $(eval $(call pkg_config_find_and_add,BMP,libnsbmp,NetSurf BMP decoder))
- $(eval $(call pkg_config_find_and_add,GIF,libnsgif,NetSurf GIF decoder))
-
-
- CFLAGS += -std=c99 -g -I. $(WARNFLAGS) \
- $(shell $(PKG_CONFIG) --cflags libhubbub libcurl openssl) \
- $(shell xml2-config --cflags) \
- -D_BSD_SOURCE \
- -D_XOPEN_SOURCE=600 \
- -D_POSIX_C_SOURCE=200112L
-
- LDFLAGS += -lxml2 -lz -ljpeg -lcurl -lm
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl openssl)
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libhubbub)
- SUBTARGET := -dummy
- endif
-
- ifeq ($(NETSURF_FB_FRONTEND),sdl)
- $(eval $(call pkg_config_find_and_add,RSVG,librsvg-2.0,SVG rendering))
- $(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,RISC OS sprite rendering))
- $(eval $(call pkg_config_find_and_add,BMP,libnsbmp,NetSurf BMP decoder))
- $(eval $(call pkg_config_find_and_add,GIF,libnsgif,NetSurf GIF decoder))
-# $(eval $(call pkg_config_find_and_add,SDL,libSDL,SDL Library))
-
-
- CFLAGS += -std=c99 -g -I. $(WARNFLAGS) \
- $(shell $(PKG_CONFIG) --cflags libhubbub libcurl openssl) \
- $(shell xml2-config --cflags) \
- -D_BSD_SOURCE \
- -D_XOPEN_SOURCE=600 \
- -D_POSIX_C_SOURCE=200112L
-
- LDFLAGS += -lxml2 -lz -ljpeg -lcurl -lm -lSDL
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl openssl)
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libhubbub)
- SUBTARGET := -sdl
- endif
-
- ifeq ($(NETSURF_FB_FRONTEND),vnc)
- $(eval $(call pkg_config_find_and_add,RSVG,librsvg-2.0,SVG rendering))
- $(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,RISC OS sprite rendering))
- $(eval $(call pkg_config_find_and_add,BMP,libnsbmp,NetSurf BMP decoder))
- $(eval $(call pkg_config_find_and_add,GIF,libnsgif,NetSurf GIF decoder))
-# $(eval $(call pkg_config_find_and_add,VNCSERVER,libvncserver,VNC server))
+ CFLAGS += -Dnsframebuffer '-DNETSURF_FB_RESPATH="$(NETSURF_FB_RESPATH_$(NETSURF_FB_FRONTEND))"'
+ $(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,RISC OS sprite rendering))
+ $(eval $(call pkg_config_find_and_add,BMP,libnsbmp,NetSurf BMP decoder))
+ $(eval $(call pkg_config_find_and_add,GIF,libnsgif,NetSurf GIF decoder))
- CFLAGS += -std=c99 -g -I. $(WARNFLAGS) \
- $(shell $(PKG_CONFIG) --cflags libhubbub libcurl openssl) \
- $(shell xml2-config --cflags) \
- -D_BSD_SOURCE \
- -D_XOPEN_SOURCE=600 \
- -D_POSIX_C_SOURCE=200112L
- LDFLAGS += -lxml2 -lz -ljpeg -lcurl -lm -lvncserver
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl openssl)
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libhubbub)
- SUBTARGET := -vnc
- endif
+ CFLAGS += -std=c99 -g -I. -Dsmall $(WARNFLAGS) \
+ -D_BSD_SOURCE \
+ -D_XOPEN_SOURCE=600 \
+ -D_POSIX_C_SOURCE=200112L \
+ $(shell $(PKG_CONFIG) --cflags libnsfb-0) \
+ $(shell $(PKG_CONFIG) --cflags libhubbub libcurl openssl) \
+ $(shell xml2-config --cflags)
- ifeq ($(SUBTARGET),)
- $(error Unable to proceed, no FB subtarget chosen.)
- endif
+ LDFLAGS += -Wl,--whole-archive $(shell $(PKG_CONFIG) --libs libnsfb) -Wl,--no-whole-archive
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl libhubbub openssl)
endif