summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2016-12-05 18:26:12 (GMT)
committer Chris Young <chris@unsatisfactorysoftware.co.uk>2016-12-05 18:26:12 (GMT)
commit06c85e1df894a99b77a9539decdaf8ba862c7883 (patch)
tree4e0d07692207bc3270eb0e6af5cf91fd42387653
parent840669851fb94e0c9ff60af00277f0d660f7e0c0 (diff)
downloadnetsurf-06c85e1df894a99b77a9539decdaf8ba862c7883.tar.gz
netsurf-06c85e1df894a99b77a9539decdaf8ba862c7883.tar.bz2
Updates to allow clib2 memory debug mode to work
-rw-r--r--frontends/amiga/Makefile6
-rwxr-xr-xfrontends/amiga/memory.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index b539735..67e3be0 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -7,7 +7,7 @@ CFLAGS += -std=c99 -Dnsamiga
ifneq ($(SUBTARGET),os3)
CFLAGS += -O2 -finline-functions -U__STRICT_ANSI__ -D__USE_INLINE__ -D__USE_BASETYPE__
else
- CFLAGS += -O2 -DPATH_MAX=1024 -D__m68k__ -m68020
+ CFLAGS += -O2 -DPATH_MAX=1024 -D__m68k__ -m68020 -D__MEM_DEBUG
endif
$(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon))
@@ -20,10 +20,10 @@ LDFLAGS += $(shell $(PKG_CONFIG) --static --libs libcurl openssl)
LDFLAGS += $(shell $(PKG_CONFIG) --libs tre)
LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib
-LDFLAGS += -lpbl -liconv -ldebug
+LDFLAGS += -lpbl -liconv
ifeq ($(SUBTARGET),os3)
- LDFLAGS += -lamiga -lm
+ LDFLAGS += -lamiga -lm -ldebug
endif
EXETARGET := NetSurf
diff --git a/frontends/amiga/memory.c b/frontends/amiga/memory.c
index b52997f..b2a20be 100755
--- a/frontends/amiga/memory.c
+++ b/frontends/amiga/memory.c
@@ -148,7 +148,7 @@ struct Interrupt *ami_memory_init(void)
struct Interrupt *memhandler = malloc(sizeof(struct Interrupt));
if(memhandler == NULL) return NULL; // we're screwed
- kprintf("init");
+ kprintf("netsurf init");
memhandler->is_Node.ln_Pri = -127; // low down as will be slow
memhandler->is_Node.ln_Name = "NetSurf low memory handler";