From eb28188661262eef8aad4b530a3f16532aceffd4 Mon Sep 17 00:00:00 2001 From: Adrien Destugues - PulkoMandy Date: Thu, 15 Nov 2012 22:34:42 +0100 Subject: Update the BeOS/Haiku port MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Toolbar use HVIF icons on Haiku * Download window * Some tweaks to the event loop to let network traffic happen Signed-off-by: François Revol --- beos/Makefile.target | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'beos/Makefile.target') diff --git a/beos/Makefile.target b/beos/Makefile.target index af7c939ad..f4b51ab3c 100644 --- a/beos/Makefile.target +++ b/beos/Makefile.target @@ -9,8 +9,10 @@ # for Haiku LDFLAGS += -L/boot/common/lib # some people do *not* have libm... - LDFLAGS += -lcurl -liconv - LDFLAGS += -lssl -lcrypto -lcss -ldom -lparserutils -lhubbub -lwapcaplet + LDFLAGS += -lssl -lcrypto -lcss + $(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny))) + LDFLAGS += -ldom -lparserutils -lhubbub -lwapcaplet + LDFLAGS += -lexpat -lxml2 -lcurl -liconv CFLAGS += -I. -O $(WARNFLAGS) -Dnsbeos \ -D_BSD_SOURCE -D_POSIX_C_SOURCE \ @@ -59,9 +61,8 @@ # cross: Haiku ? NETLDFLAGS := -lnetwork endif - LDFLAGS += -lbe -ltranslation $(NETLDFLAGS) + LDFLAGS += -lbe -ltranslation -ltracker $(NETLDFLAGS) -lstdc++ -lsupc++ - $(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny))) ifeq ($(HOST),beos) CFLAGS += -I$(PREFIX)/include LDFLAGS += -L$(PREFIX)/lib @@ -82,11 +83,9 @@ # ---------------------------------------------------------------------------- # S_BEOS are sources purely for the BeOS build -S_BEOS := about.cpp bitmap.cpp fetch_rsrc.cpp \ - filetype.cpp font.cpp gui.cpp login.cpp \ - gui_options.cpp plotters.cpp \ - scaffolding.cpp search.cpp schedule.cpp \ - thumbnail.cpp treeview.cpp throbber.cpp \ +S_BEOS := about.cpp bitmap.cpp download.cpp fetch_rsrc.cpp filetype.cpp \ + font.cpp gui.cpp login.cpp gui_options.cpp plotters.cpp scaffolding.cpp \ + search.cpp schedule.cpp thumbnail.cpp treeview.cpp throbber.cpp \ window.cpp system_colour.cpp S_BEOS := $(addprefix beos/,$(S_BEOS)) @@ -98,7 +97,7 @@ RDEF_IMP_BEOS := $(addprefix $(OBJROOT)/,$(subst /,_,$(RDEF_IMP_BEOS))) RDEP_BEOS := \ adblock.css beosdefault.css default.css internal.css quirks.css \ - netsurf.png ca-bundle.txt messages + netsurf.png ca-bundle.txt RDEP_BEOS := $(addprefix beos/res/,$(RDEP_BEOS)) \ $(wildcard beos/res/Icons/*.png) \ $(wildcard beos/res/throbber/throbber*.png) @@ -126,7 +125,7 @@ install-beos: @cp -vRL beos/res/beosdefault.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES) @cp -vRL gtk/res/license $(DESTDIR)$(NETSURF_BEOS_RESOURCES) # @cp -vRL beos/res/throbber/*.png $(DESTDIR)$(NETSURF_BEOS_RESOURCES)throbber - gzip -9v < beos/res/messages > $(DESTDIR)$(NETSURF_BEOS_RESOURCES)messages + $(call split_install_messages, beos, $(DESTDIR)$(NETSURF_BEOS_RESOURCES)) # ---------------------------------------------------------------------------- # Package target -- cgit v1.2.3