summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2010-09-21 17:58:30 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2010-09-21 17:58:30 +0000
commit40a530e99ec38dc57e062ec052b44e9a4da41cfe (patch)
tree03f4c46e667e2048888d2189d12d528c3b272f1e
parent6124966ab9f8bdbba39d279c1f7e1cbd6c04af2d (diff)
downloadnetsurf-40a530e99ec38dc57e062ec052b44e9a4da41cfe.tar.gz
netsurf-40a530e99ec38dc57e062ec052b44e9a4da41cfe.tar.bz2
Fix OS4 static (non-Cairo) build
svn path=/trunk/netsurf/; revision=10808
-rw-r--r--Makefile4
-rw-r--r--amiga/download.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index effdabb62..f8b13207e 100644
--- a/Makefile
+++ b/Makefile
@@ -526,8 +526,8 @@ ifeq ($(TARGET),amiga)
$(eval $(call feature_enabled,MNG,,-llcms -ljpeg,PNG/JNG/MNG (libmng)))
CFLAGS += -D__USE_INLINE__ -std=c99 -I . -I /SDK/local/common/include/libpng12 -Dnsamiga
- LDFLAGS += -lxml2 -lcurl -lpthread -lregex -liconv -lauto
- LDFLAGS += -lssl -lcrypto -lhubbub -lcss -lparserutils -lwapcaplet
+ LDFLAGS += -lxml2 -lcurl -lpthread -lregex -lauto
+ LDFLAGS += -lssl -lcrypto -lhubbub -lcss -lparserutils -lwapcaplet -liconv
ifeq ($(NETSURF_AMIGA_USE_CAIRO),YES)
CFLAGS += -DNS_AMIGA_CAIRO -I /SDK/local/common/include/cairo
diff --git a/amiga/download.c b/amiga/download.c
index f9ea96194..e6302a842 100644
--- a/amiga/download.c
+++ b/amiga/download.c
@@ -347,11 +347,13 @@ void gui_drag_save_object(gui_save_type type, hlcache_handle *c,
filetype = "drawer";
break;
case GUI_SAVE_OBJECT_NATIVE:
+#ifdef WITH_NS_SVG
if(content_get_type(c) == CONTENT_SVG)
{
filetype = "dr2d";
}
else
+#endif
{
filetype = "ilbm";
}