From ee95879c08bd807cfaac9ae59899d6c7f8772e0f Mon Sep 17 00:00:00 2001
From: Ashish Gupta <ashmew2@gmail.com>
Date: Fri, 14 Apr 2017 14:06:18 +0200
Subject: Steal framebuffer and reuse in kolibrios port

---
 Makefile | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 21edda463..865941985 100644
--- a/Makefile
+++ b/Makefile
@@ -136,7 +136,11 @@ MESSAGES_TARGET=!NetSurf/Resources
 PERL=perl
 MKDIR=mkdir
 TOUCH=touch
-STRIP?=strip
+ifneq ($(TARGET),kolibrios)
+	STRIP?=strip
+else
+	STRIP?=kos32-strip
+endif
 SPLIT_MESSAGES=$(PERL) utils/split-messages.pl
 
 # build verbosity
@@ -530,13 +534,13 @@ else
   KOL_LIBC := $(HOME)/kolibrios/contrib/sdk/sources/newlib/libc/include/
   KOL_LIB_DIR := $(HOME)/kolibrios/contrib/sdk/lib
   LIB_LDFLAGS := -L$(KOL_LIB_DIR) -lfreetype
-  OS_LDFLAGS := -static -Tapp-static.lds
+  OS_LDFLAGS := -static -S -Tapp-dynamic.lds --image-base 0
 
   NS_INCLUDE := $(PREFIX)/include
   NS_LIB_LDFLAGS := -L$(PREFIX)/lib/ -lnsbmp -lnsutils -lwapcaplet -lsvgtiny -lnsgif -lutf8proc -lcss -lnsfb -lparserutils -ldom -lhubbub -lz
 
   CFLAGS += -c -fno-ident -fomit-frame-pointer -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -U__BSD_VISIBLE -I$(KOL_LIBC) -I$(NS_INCLUDE) 
-  LDFLAGS +=  $(OS_LDFLAGS) $(NS_LIB_LDFLAGS) $(LIB_LDFLAGS) -lc -lgcc -lc.dll
+  LDFLAGS +=  $(OS_LDFLAGS) $(NS_LIB_LDFLAGS) $(LIB_LDFLAGS) -lgcc -lc.dll
 endif
 
 # Common libraries without pkg-config support
@@ -701,7 +705,7 @@ OBJECTS := $(sort $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.c,%.o,$(patsu
 IFLAGS = $(addprefix -I,$(INCLUDE_DIRS))
 
 ifeq ($(TARGET),kolibrios)
-   KOLOBJECTS = $(HOME)/kolibrios/programs/develop/libraries/iconv/iconv.o $(HOME)/kolibrios/programs/fs/unzip60/kolibri/dirent.o
+   KOLOBJECTS = $(HOME)/kolibrios/programs/develop/libraries/iconv/iconv.o $(HOME)/kolibrios/programs/fs/unzip60/kolibri/dirent.o $(HOME)/NETSURFLIBS/netsurf/font_internal.o
 endif
 
 $(EXETARGET): $(OBJECTS) $(RESOURCES) $(MESSAGES)
@@ -709,6 +713,7 @@ $(EXETARGET): $(OBJECTS) $(RESOURCES) $(MESSAGES)
 ifeq ($(TARGET),kolibrios)
 	$(warning $(LD) -o $(EXETARGET) $(OBJECTS) $(KOLOBJECTS) $(LDFLAGS))
 	$(Q)$(LD) -o $(EXETARGET) $(OBJECTS) $(KOLOBJECTS)  $(LDFLAGS)
+	objcopy -O binary nskolibrios
 else ifneq ($(TARGET)$(SUBTARGET),riscos-elf)
 	$(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS)
 else
-- 
cgit v1.2.3