diff options
| author | Ashish Gupta <ashmew2@gmail.com> | 2017-04-14 14:06:18 +0200 |
|---|---|---|
| committer | Ashish Gupta <ashmew2@gmail.com> | 2017-10-25 22:04:54 +0200 |
| commit | c77fa3066e981d5a620850148926ea31d6145f9c (patch) | |
| tree | 2ebf027753f175c1818c894fde47e41170ac9ea4 /Makefile | |
| parent | 7fb4c9e101f8477217ce9d818835bab5cc30f484 (diff) | |
| download | netsurf-c77fa3066e981d5a620850148926ea31d6145f9c.tar.gz netsurf-c77fa3066e981d5a620850148926ea31d6145f9c.tar.bz2 | |
Steal framebuffer and reuse in kolibrios port
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -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 @@ -533,13 +537,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 @@ -726,7 +730,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) @@ -734,6 +738,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 |