summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Kendrick <rjek@netsurf-browser.org>2008-07-28 21:21:40 +0000
committerRob Kendrick <rjek@netsurf-browser.org>2008-07-28 21:21:40 +0000
commit97e1d9503f67561488fc3ad26ae18f4b463be6e6 (patch)
treef123154dbacd9a89cfad5ba76c8a35ab10570c98
parente0e6f02f82af86e215fcd25495e1bd5865751018 (diff)
downloadnetsurf-97e1d9503f67561488fc3ad26ae18f4b463be6e6.tar.gz
netsurf-97e1d9503f67561488fc3ad26ae18f4b463be6e6.tar.bz2
Make sure new Makefile works when cross-building to RISC OS, as well as when building natively.
svn path=/trunk/netsurf/; revision=4778
-rw-r--r--Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index ccaa72004..0e02f8189 100644
--- a/Makefile
+++ b/Makefile
@@ -2,15 +2,16 @@
# Makefile for NetSurf
#
# Copyright 2007 Daniel Silverstone <dsilvers@netsurf-browser.org>
+# Copyright 2008 Rob Kendrick <rjek@netsurf-browser.org>
#
-#
-
# Trivially, invoke as:
# make
# to build native, or:
# make TARGET=riscos
# to cross-build for RO.
#
+# Look at Makefile.config for configuration options.
+#
# Tested on unix platforms (building for GTK and cross-compiling for RO) and
# on RO (building for RO).
#
@@ -171,11 +172,15 @@ LDFLAGS += -lz
ifeq ($(HOST),riscos)
LDFLAGS := -Xlinker -symbols=$(OBJROOT)/sym -lxml2 -lz -lm -lcurl -lssl \
-lcrypto -lcares
+endif
+
+ifeq ($(TARGET),riscos)
$(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny))
$(eval $(call feature_enabled,DRAW,-DWITH_DRAW,-lpencil))
$(eval $(call feature_enabled,SPRITE,-DWITH_SPRITE,))
$(eval $(call feature_enabled,ARTWORKS,-DWITH_ARTWORKS,))
+
endif
# ----------------------------------------------------------------------------