summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFran├žois Revel <mmu_man@netsurf-browser.org>2008-06-05 22:54:49 +0000
committerFran├žois Revel <mmu_man@netsurf-browser.org>2008-06-05 22:54:49 +0000
commit846c65b899fef90500916669cef0a48f0d5c4f20 (patch)
tree881e5dfb8ada8299e73f27bf492453028f3cb273
parent524e29c4dfcbe713fc25075c9e1c566370062a55 (diff)
downloadnetsurf-846c65b899fef90500916669cef0a48f0d5c4f20.tar.gz
netsurf-846c65b899fef90500916669cef0a48f0d5c4f20.tar.bz2
BeOS: I can now use *ng and jpeg... Also link to libtranslation, it's used to load the throbber pngs. Switched from beres to rc as ressource compiler, it should allow importing external css and html files from resources.
svn path=/trunk/netsurf/; revision=4264
-rw-r--r--Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index b5b66da49..175db59ea 100644
--- a/Makefile
+++ b/Makefile
@@ -142,7 +142,7 @@ ifeq ($(HOST),beos)
# some people do *not* have libm...
LDFLAGS := -L/boot/home/config/lib
LDFLAGS += -lxml2 -lz -lcurl -lssl -lcrypto -ljpeg -liconv
-#LDFLAGS += -lmng
+LDFLAGS += -lmng -ljpeg
else
LDFLAGS := $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl openssl)
LDFLAGS += -lz -lm -lmng -ljpeg
@@ -216,6 +216,7 @@ CFLAGS += -g -O0
# -DDEBUG=1
BEOS_BERES := beres
+BEOS_RC := rc
BEOS_XRES := xres
BEOS_SETVER := setversion
BEOS_MIMESET := mimeset
@@ -247,7 +248,7 @@ else
# cross: Haiku ?
NETLDFLAGS := -lnetwork
endif
-LDFLAGS += -lbe $(NETLDFLAGS)
+LDFLAGS += -lbe -ltranslation $(NETLDFLAGS)
endif
@@ -318,7 +319,8 @@ endif
ifeq ($(TARGET),beos)
$(RSRC_BEOS): $(RDEF_BEOS)
- $(Q)$(BEOS_BERES) -o $@ $<
+ $(VQ)echo " RC: $<"
+ $(Q)$(BEOS_RC) -o $@ $<
endif
clean-target: