Step 2 : Abuse _TARGET_IS_KOLIBRIOS and build with make TARGET=kolibrios

6 files changed, 82 insertions, 101 deletions

diff --git a/frontends/framebuffer/font.h b/frontends/framebuffer/font.h
index 722a604e4..dfac43695 100644
--- a/frontends/framebuffer/font.h
+++ b/frontends/framebuffer/font.h
@@ -58,11 +58,7 @@ nserror fb_font_position(const struct plot_font_style *fstyle, const char *strin
 nserror fb_font_width(const struct plot_font_style *fstyle, const char *string, size_t length, int *width);
 
 
-#ifdef FB_USE_FREETYPE
-#include "framebuffer/font_freetype.h"
-#else
 #include "framebuffer/font_internal.h"
-#endif
 
 #endif /* NETSURF_FB_FONT_H */
 
diff --git a/frontends/kolibrios/Makefile b/frontends/kolibrios/Makefile
index ad86c4330..bed51a724 100644
--- a/frontends/kolibrios/Makefile
+++ b/frontends/kolibrios/Makefile
@@ -1,9 +1,9 @@
-CWARNFLAGS += -Wno-error -Wno-redundant-decls -Wno-char-subscripts -Wno-undef
-CDMACROS := -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -D_NETBSD_SOURCE 
-KOL_LIBC_INCLUDES := -I$(HOME)/kolibrios/contrib/sdk/sources/newlib/libc/include/
-KOL_OTHER_INCLUDES := -I$(HOME)/kolibrios/contrib/sdk/sources/libpng/ -I$(HOME)/kolibrios/contrib/sdk/sources/zlib -I$(HOME)/kolibrios/contrib/sdk/sources/freetype/include -I$(HOME)/kolibrios/contrib/sdk/sources/freetype/include -I$(HOME)/dev-netsurf/workspace/netsurf/libiconv/libiconv-1.14 -I$(HOME)/dev-netsurf/workspace/netsurf/libjpeg
+CWARNFLAGS += -Wno-error -Wno-redundant-decls -Wno-char-subscripts -Wno-undef -Wno-implicit-function-declaration -Wno-int-conversion -Wno-nested-externs -Wno-format-extra-args -Wno-format
+DMACROS := -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -D_NETBSD_SOURCE -D_TARGET_IS_KOLIBRIOS
 
-CFLAGS += -fno-ident -fomit-frame-pointer $(KOL_LIBC_INCLUDES) $(KOL_OTHER_INCLUDES) -std=c99  -g
+KOL_OTHER_INCLUDES := -I$(HOME)/kolibrios/contrib/sdk/sources/libpng/ -I$(HOME)/kolibrios/contrib/sdk/sources/zlib -I$(HOME)/kolibrios/contrib/sdk/sources/freetype/include -I$(HOME)/kolibrios/contrib/sdk/sources/freetype/include -I$(HOME)/dev-netsurf/workspace/netsurf/libjpeg
+
+CFLAGS += $(KOL_OTHER_INCLUDES) $(DMACROS) -std=c99  -g
 
 CFLAGS += '-DNETSURF_KOLIBRI_FONTPATH="$(NETSURF_KOLIBRI_FONTPATH)"'
 CFLAGS += '-DNETSURF_KOLIBRI_FONT_SANS_SERIF="$(NETSURF_KOLIBRI_FONT_SANS_SERIF)"'
@@ -12,9 +12,11 @@ CFLAGS += '-DKOLIBRI_USE_FREETYPE'
 
 ##########################################################################
 # Only for FB compat with kolibri. Get rid soon.
-CFLAGS += '-DNETSURF_FB_RESPATH="$(NETSURF_FB_RESPATH)"'
+CFLAGS += '-DNETSURF_FB_RESPATH="$(NETSURF_KOLIBRI_RESPATH)"'
+
 # compile time font locations
-CFLAGS += '-DNETSURF_FB_FONTPATH="$(NETSURF_FB_FONTPATH)"'
+CFLAGS += '-DNETSURF_FB_FONTPATH="$(NETSURF_KOLIBRI_FONTPATH)"'
+CFLAGS += '-DKOLIBRI_FONT_FREETYPE_SANS_SERIF="$(NETSURF_KOLIBRI_FONT_SANS_SERIF)"'
 CFLAGS += '-DNETSURF_FB_FONT_SANS_SERIF="$(NETSURF_KOLIBRI_FONT_SANS_SERIF)"'
 CFLAGS += '-DNETSURF_FB_FONT_SANS_SERIF_BOLD="$(NETSURF_KOLIBRI_FONT_SANS_SERIF)"'
 CFLAGS += '-DNETSURF_FB_FONT_SANS_SERIF_ITALIC="$(NETSURF_KOLIBRI_FONT_SANS_SERIF)"'
@@ -29,41 +31,36 @@ CFLAGS += '-DNETSURF_FB_FONT_FANTASY="$(NETSURF_KOLIBRI_FONT_SANS_SERIF)"'
 
 #########################################################################
 
-KOLIBRI_IMAGE_left_arrow := icons/back.png
-KOLIBRI_IMAGE_right_arrow := icons/forward.png
-KOLIBRI_IMAGE_reload := icons/reload.png
-KOLIBRI_IMAGE_stop_image := icons/stop.png
-KOLIBRI_IMAGE_history_image := icons/history.png
-
-KOLIBRI_IMAGE_left_arrow_g := icons/back_g.png
-KOLIBRI_IMAGE_right_arrow_g := icons/forward_g.png
-KOLIBRI_IMAGE_reload_g := icons/reload_g.png
-KOLIBRI_IMAGE_stop_image_g := icons/stop_g.png
-KOLIBRI_IMAGE_history_image_g := icons/history_g.png
-
-KOLIBRI_IMAGE_scrolll := icons/scrolll.png
-KOLIBRI_IMAGE_scrollr := icons/scrollr.png
-KOLIBRI_IMAGE_scrollu := icons/scrollu.png
-KOLIBRI_IMAGE_scrolld := icons/scrolld.png
-
-KOLIBRI_IMAGE_osk_image := icons/osk.png
-
-KOLIBRI_IMAGE_pointer_image := pointers/default.png
-KOLIBRI_IMAGE_hand_image := pointers/point.png
-KOLIBRI_IMAGE_caret_image := pointers/caret.png
-KOLIBRI_IMAGE_menu_image := pointers/menu.png
-KOLIBRI_IMAGE_progress_image := pointers/progress.png
-KOLIBRI_IMAGE_move_image := pointers/move.png
-
-KOLIBRI_IMAGE_throbber0 := throbber/throbber0.png
-KOLIBRI_IMAGE_throbber1 := throbber/throbber1.png
-KOLIBRI_IMAGE_throbber2 := throbber/throbber2.png
-KOLIBRI_IMAGE_throbber3 := throbber/throbber3.png
-KOLIBRI_IMAGE_throbber4 := throbber/throbber4.png
-KOLIBRI_IMAGE_throbber5 := throbber/throbber5.png
-KOLIBRI_IMAGE_throbber6 := throbber/throbber6.png
-KOLIBRI_IMAGE_throbber7 := throbber/throbber7.png
-KOLIBRI_IMAGE_throbber8 := throbber/throbber8.png
+KOLIBRI_IMAGE_left_arrow := $(FRONTEND_SOURCE_DIR)/res/icons/back.png
+KOLIBRI_IMAGE_right_arrow := $(FRONTEND_SOURCE_DIR)/res/icons/forward.png
+KOLIBRI_IMAGE_reload := $(FRONTEND_SOURCE_DIR)/res/icons/reload.png
+KOLIBRI_IMAGE_stop_image := $(FRONTEND_SOURCE_DIR)/res/icons/stop.png
+KOLIBRI_IMAGE_history_image := $(FRONTEND_SOURCE_DIR)/res/icons/history.png
+KOLIBRI_IMAGE_left_arrow_g := $(FRONTEND_SOURCE_DIR)/res/icons/back_g.png
+KOLIBRI_IMAGE_right_arrow_g := $(FRONTEND_SOURCE_DIR)/res/icons/forward_g.png
+KOLIBRI_IMAGE_reload_g := $(FRONTEND_SOURCE_DIR)/res/icons/reload_g.png
+KOLIBRI_IMAGE_stop_image_g := $(FRONTEND_SOURCE_DIR)/res/icons/stop_g.png
+KOLIBRI_IMAGE_history_image_g := $(FRONTEND_SOURCE_DIR)/res/icons/history_g.png
+KOLIBRI_IMAGE_scrolll := $(FRONTEND_SOURCE_DIR)/res/icons/scrolll.png
+KOLIBRI_IMAGE_scrollr := $(FRONTEND_SOURCE_DIR)/res/icons/scrollr.png
+KOLIBRI_IMAGE_scrollu := $(FRONTEND_SOURCE_DIR)/res/icons/scrollu.png
+KOLIBRI_IMAGE_scrolld := $(FRONTEND_SOURCE_DIR)/res/icons/scrolld.png
+KOLIBRI_IMAGE_osk_image := $(FRONTEND_SOURCE_DIR)/res/icons/osk.png
+KOLIBRI_IMAGE_pointer_image := $(FRONTEND_SOURCE_DIR)/res/pointers/default.png
+KOLIBRI_IMAGE_hand_image := $(FRONTEND_SOURCE_DIR)/res/pointers/point.png
+KOLIBRI_IMAGE_caret_image := $(FRONTEND_SOURCE_DIR)/res/pointers/caret.png
+KOLIBRI_IMAGE_menu_image := $(FRONTEND_SOURCE_DIR)/res/pointers/menu.png
+KOLIBRI_IMAGE_progress_image := $(FRONTEND_SOURCE_DIR)/res/pointers/progress.png
+KOLIBRI_IMAGE_move_image := $(FRONTEND_SOURCE_DIR)/res/pointers/move.png
+KOLIBRI_IMAGE_throbber0 := $(FRONTEND_SOURCE_DIR)/res/throbber/throbber0.png
+KOLIBRI_IMAGE_throbber1 := $(FRONTEND_SOURCE_DIR)/res/throbber/throbber1.png
+KOLIBRI_IMAGE_throbber2 := $(FRONTEND_SOURCE_DIR)/res/throbber/throbber2.png
+KOLIBRI_IMAGE_throbber3 := $(FRONTEND_SOURCE_DIR)/res/throbber/throbber3.png
+KOLIBRI_IMAGE_throbber4 := $(FRONTEND_SOURCE_DIR)/res/throbber/throbber4.png
+KOLIBRI_IMAGE_throbber5 := $(FRONTEND_SOURCE_DIR)/res/throbber/throbber5.png
+KOLIBRI_IMAGE_throbber6 := $(FRONTEND_SOURCE_DIR)/res/throbber/throbber6.png
+KOLIBRI_IMAGE_throbber7 := $(FRONTEND_SOURCE_DIR)/res/throbber/throbber7.png
+KOLIBRI_IMAGE_throbber8 := $(FRONTEND_SOURCE_DIR)/res/throbber/throbber8.png
 
 # Host tool to convert image bitmaps to source code.
 #
@@ -71,10 +68,11 @@ KOLIBRI_IMAGE_throbber8 := throbber/throbber8.png
 # header, we get new images built.
 
 HOST_LDFLAGS += -lpng
+
 $(TOOLROOT)/convert_image: $(TOOLROOT)/created $(FRONTEND_SOURCE_DIR)/fb/convert_image.c 
 	$(VQ)echo " HOST CC: $@"
 	$(Q)$(HOST_CC) $(HOST_CFLAGS) -o $@ $(FRONTEND_SOURCE_DIR)/fb/convert_image.c $(HOST_LDFLAGS)
-	
+
 # 1: input file
 # 2: output file
 # 3: bitmap name
@@ -88,18 +86,15 @@ $(2): $(1) $(TOOLROOT)/convert_image
 endef
 
 S_IMAGES :=
-
 $(eval $(foreach V,$(filter KOLIBRI_IMAGE_%,$(.VARIABLES)),$(call convert_image,$($(V)),$(OBJROOT)/image-$(patsubst KOLIBRI_IMAGE_%,%,$(V)).c,$(patsubst KOLIBRI_IMAGE_%,%,$(V)))))
-$(warning eval $(foreach V,$(filter KOLIBRI_IMAGE_%,$(.VARIABLES)),$(call convert_image,$($(V)),$(OBJROOT)/image-$(patsubst KOLIBRI_IMAGE_%,%,$(V)).c,$(patsubst KOLIBRI_IMAGE_%,%,$(V)))))
-$(error fuck this)
 
 # Internal fonts to generate
-KOLIBRI_FONT_internal_ns-sans := framebuffer/res/fonts/glyph_data
+KOLIBRI_FONT_internal_ns-sans := $(FRONTEND_SOURCE_DIR)/res/fonts/glyph_data
 
 # Internal font conversion
-$(TOOLROOT)/convert_font: $(TOOLROOT)/created framebuffer/convert_font.c
+$(TOOLROOT)/convert_font: $(TOOLROOT)/created $(FRONTEND_SOURCE_DIR)/fb/convert_font.c
 	$(VQ)echo " HOST CC: $@"
-	$(Q)$(HOST_CC) -o $@ framebuffer/convert_font.c
+	$(Q)$(HOST_CC) -o $@ $(FRONTEND_SOURCE_DIR)/fb/convert_font.c
 
 # 1: input file
 # 2: output source code file
@@ -116,12 +111,8 @@ $(2): $(1) $(TOOLROOT)/convert_font
 endef
 
 S_FONTS :=
-
 $(eval $(foreach V,$(filter KOLIBRI_FONT_$(NETSURF_KOLIBRI_FONTLIB)_%,$(.VARIABLES)),$(call convert_font,$($(V)),$(OBJROOT)/font-$(patsubst KOLIBRI_FONT_$(NETSURF_KOLIBRI_FONTLIB)_%,%,$(V)).c,$(OBJROOT)/font-$(patsubst KOLIBRI_FONT_$(NETSURF_KOLIBRI_FONTLIB)_%,%,$(V)).h,$(patsubst KOLIBRI_FONT_$(NETSURF_KOLIBRI_FONTLIB)_%,%,$(V)))))
 
-
-LDFLAGS := -static -Tapp-static.lds -L /home/bob/kolibrios/contrib/sdk/lib/ -lfreetype -lz /home/bob/dev-netsurf/workspace/netsurf/inst/lib/libcss.a /home/bob/dev-netsurf/workspace/netsurf/inst/lib/libdom.a /home/bob/dev-netsurf/workspace/netsurf/inst/lib/libhubbub.a /home/bob/dev-netsurf/workspace/netsurf/inst/lib/libnsbmp.a /home/bob/dev-netsurf/workspace/netsurf/inst/lib/libnsfb.a /home/bob/dev-netsurf/workspace/netsurf/inst/lib/libnsgif.a /home/bob/dev-netsurf/workspace/netsurf/inst/lib/libnsutils.a /home/bob/dev-netsurf/workspace/netsurf/inst/lib/libparserutils.a /home/bob/dev-netsurf/workspace/netsurf/inst/lib/libutf8proc.a /home/bob/dev-netsurf/workspace/netsurf/inst/lib/libwapcaplet.a /home/bob/dev-netsurf/workspace/netsurf/inst/lib/libnsgif.a /home/autobuild/tools/win32/lib/libiconv.a -ldll -lc -lgcc -lc -ldll
-
 # non optional pkg-configed libs
 #$(eval $(call pkg_config_find_and_add,libcurl,Curl ))
 #$(eval $(call pkg_config_find_and_add,openssl,OpenSSL))
@@ -138,8 +129,8 @@ LDFLAGS := -static -Tapp-static.lds -L /home/bob/kolibrios/contrib/sdk/lib/ -lfr
 # $(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript))
 
 #S_KOLIBRIOS := main.c kolibri_misc.c kolibri_debug.c kolibri_filesystem.c kolibri_regex.c kolibri_http.c 
-S_KOLIBRIOS :=
-S_FRAMEBUFFER := gui.c framebuffer.c schedule.c bitmap.c fetch.c findfile.c localhistory.c clipboard.c
+S_KOLIBRIOS := 
+S_FRAMEBUFFER := gui.c framebuffer.c schedule.c bitmap.c fetch.c findfile.c localhistory.c clipboard.c 
 S_FRAMEBUFFER_FBTK := fbtk.c event.c fill.c bitmap.c user.c window.c text.c scroll.c osk.c
 S_FRAMEBUFFER += font_$(NETSURF_KOLIBRI_FONTLIB).c
 
diff --git a/frontends/kolibrios/Makefile.defaults b/frontends/kolibrios/Makefile.defaults
index e5e5111c2..bada45656 100644
--- a/frontends/kolibrios/Makefile.defaults
+++ b/frontends/kolibrios/Makefile.defaults
@@ -23,10 +23,11 @@ NETSURF_USE_ROSPRITE := NO
 
 # Library to use for font plotting
 # Valid options: internal, freetype
-NETSURF_KOLIBRI_FONTLIB := freetype
+NETSURF_KOLIBRI_FONTLIB := internal
 
 # Default freetype font files
-NETSURF_KOLIBRI_FONT_SANS_SERIF := sans.ttf
+NETSURF_KOLIBRI_FONT_SANS_SERIF := frontends/kolibrios/res/sans.ttf
+KOLIBRI_FONT_freetype_sans_serif := frontends/kolibrios/res/sans.ttf
 
 # Default binary install path
 NETSURF_FRAMEBUFFER_BIN := $(PREFIX)/bin/
@@ -35,7 +36,7 @@ NETSURF_FRAMEBUFFER_BIN := $(PREFIX)/bin/
 NETSURF_FRAMEBUFFER_RESOURCES := $(PREFIX)/share/netsurf/
 
 # Res path when running on KolibriOS
-NETSURF_KOLIBRI_RESPATH := /usbhd0/1/framebuffer/res/
+NETSURF_KOLIBRI_RESPATH := /usbhd0/1/res
 
 #Where are the fonts in Kolibri?
-#NETSURF_KOLIBRI_FONTPATH := /usr/share/fonts/truetype/ttf-dejavu:/usr/share/fonts/truetype/msttcorefonts
+NETSURF_KOLIBRI_FONTPATH := $(FRONTEND_SOURCE_DIR)/res/
diff --git a/frontends/kolibrios/fb/font.h b/frontends/kolibrios/fb/font.h
index 8513c93ed..f150e4431 100644
--- a/frontends/kolibrios/fb/font.h
+++ b/frontends/kolibrios/fb/font.h
@@ -57,7 +57,6 @@ nserror fb_font_position(const struct plot_font_style *fstyle, const char *strin
  */
 nserror fb_font_width(const struct plot_font_style *fstyle, const char *string, size_t length, int *width);
 
-
 #ifdef KOLIBRI_USE_FREETYPE
 #include "kolibrios/fb/font_freetype.h"
 #else
diff --git a/frontends/kolibrios/fb/gui.c b/frontends/kolibrios/fb/gui.c
index 4d4c7334f..dd5ef71ab 100644
--- a/frontends/kolibrios/fb/gui.c
+++ b/frontends/kolibrios/fb/gui.c
@@ -55,7 +55,6 @@
 #include "framebuffer/fetch.h"
 #include "framebuffer/bitmap.h"
 
-
 #define NSFB_TOOLBAR_DEFAULT_LAYOUT "blfsrutc"
 
 fbtk_widget_t *fbtk;
@@ -485,36 +484,36 @@ process_cmdline(int argc, char** argv)
 		feurl = NETSURF_HOMEPAGE;
 	}
 
-	while((opt = getopt_long(argc, argv, "f:b:w:h:",
-				 long_options, &option_index)) != -1) {
-		switch (opt) {
-		case 'f':
-			fename = optarg;
-			break;
-
-		case 'b':
-			febpp = atoi(optarg);
-			break;
-
-		case 'w':
-			fewidth = atoi(optarg);
-			break;
-
-		case 'h':
-			feheight = atoi(optarg);
-			break;
-
-		default:
-			fprintf(stderr,
-				"Usage: %s [-f frontend] [-b bpp] url\n",
-				argv[0]);
-			return false;
-		}
-	}
-
-	if (optind < argc) {
-		feurl = argv[optind];
-	}
+	/* while((opt = getopt_long(argc, argv, "f:b:w:h:", */
+	/* 			 long_options, &option_index)) != -1) { */
+	/* 	switch (opt) { */
+	/* 	case 'f': */
+	/* 		fename = optarg; */
+	/* 		break; */
+
+	/* 	case 'b': */
+	/* 		febpp = atoi(optarg); */
+	/* 		break; */
+
+	/* 	case 'w': */
+	/* 		fewidth = atoi(optarg); */
+	/* 		break; */
+
+	/* 	case 'h': */
+	/* 		feheight = atoi(optarg); */
+	/* 		break; */
+
+	/* 	default: */
+	/* 		fprintf(stderr, */
+	/* 			"Usage: %s [-f frontend] [-b bpp] url\n", */
+	/* 			argv[0]); */
+	/* 		return false; */
+	/* 	} */
+	/* } */
+
+	/* if (optind < argc) { */
+	/* 	feurl = argv[optind]; */
+	/* } */
 
 	return true;
 }
diff --git a/frontends/kolibrios/fb/schedule.c b/frontends/kolibrios/fb/schedule.c
index 3a3bda63f..72baa988e 100644
--- a/frontends/kolibrios/fb/schedule.c
+++ b/frontends/kolibrios/fb/schedule.c
@@ -15,12 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef _TARGET_IS_KOLIBRIOS
-#define _TARGET_IS_KOLIBRIOS
-#endif
-
-#ifdef _TARGET_IS_KOLIBRIOS
-
+#if defined(_TARGET_IS_KOLIBRIOS)
 
 #define	timerclear(tvp)		((tvp)->tv_sec = (tvp)->tv_usec = 0)
 #define	timerisset(tvp)		((tvp)->tv_sec || (tvp)->tv_usec)