diff options
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | Makefile.config | 7 | ||||
| -rw-r--r-- | Makefile.sources | 3 |
3 files changed, 19 insertions, 1 deletions
@@ -225,7 +225,9 @@ endif ifeq ($(HOST),beos) LDFLAGS += -L/boot/home/config/lib + # some people do *not* have libm... LDFLAGS += -lxml2 -lz -lcurl -lssl -lcrypto -liconv + LDFLAGS += -lmng -ljpeg endif # ---------------------------------------------------------------------------- @@ -385,6 +387,8 @@ ifneq ($(GCCVER),2) WARNFLAGS += -Wno-unused-parameter endif +STRIP := strip + OPT0FLAGS = -O0 # -O and -O2 can use -Wuninitialized which gives us more static checking. # unfortunately the optimiser is what provides the hints in the code tree @@ -407,6 +411,10 @@ else $(Q)$(ELF2AIF) $(EXETARGET:,ff8=,e1f) $(EXETARGET) $(Q)$(RM) $(EXETARGET:,ff8=,e1f) endif +ifeq ($(NETSURF_STRIP_BINARY),YES) + $(VQ)echo " STRIP: $(EXETARGET)" + $(Q)$(STRIP) $(EXETARGET) +endif ifeq ($(TARGET),beos) $(VQ)echo " XRES: $(EXETARGET)" $(Q)$(BEOS_XRES) -o $(EXETARGET) $(RSRC_BEOS) @@ -420,7 +428,7 @@ ifeq ($(TARGET),beos) endif ifeq ($(TARGET),beos) -$(RSRC_BEOS): $(RDEF_BEOS) +$(RSRC_BEOS): $(RDEF_BEOS) $(RDEP_BEOS) $(VQ)echo " RC: $<" $(Q)$(BEOS_RC) -o $@ $< endif diff --git a/Makefile.config b/Makefile.config index a7436fc82..106de03e6 100644 --- a/Makefile.config +++ b/Makefile.config @@ -28,7 +28,14 @@ NETSURF_USE_MNG := YES # Use libharu to enable PDF export and GTK printing support. There is no # auto-detection available for this, as it does not have a pkg-config file # Valid options: YES, NO +ifneq ($(TARGET),beos) +# not yet on BeOS NETSURF_USE_HARU_PDF := YES +endif + +# Enable stripping the NetSurf binary +# Valid options: YES, NO +NETSURF_STRIP_BINARY := NO # ---------------------------------------------------------------------------- # RISC OS-specific options diff --git a/Makefile.sources b/Makefile.sources index ce237b563..2cd6994f7 100644 --- a/Makefile.sources +++ b/Makefile.sources @@ -77,6 +77,9 @@ S_BEOS := beos_bitmap.cpp beos_fetch_rsrc.cpp beos_filetype.cpp beos_font.cpp \ S_BEOS := $(addprefix beos/,$(S_BEOS)) RDEF_BEOS := beos_res.rdef RDEF_BEOS := $(addprefix beos/,$(RDEF_BEOS)) +RDEP_BEOS := adblock.css beosdefault.css default.css ca-bundle.txt messages +RDEP_BEOS := $(addprefix beos/res/,$(RDEP_BEOS)) \ + $(wildcard beos/res/throbber/throbber*.png) # S_DEBUG are sources purely for the debug build S_DEBUG := netsurfd.c debug_bitmap.c filetyped.c fontd.c |