diff options
Diffstat (limited to 'frontends')
| -rw-r--r-- | frontends/kolibrios/Makefile | 4 | ||||
| -rw-r--r-- | frontends/kolibrios/Makefile.defaults | 2 | ||||
| -rw-r--r-- | frontends/kolibrios/fb/font_freetype.c | 2 | ||||
| -rw-r--r-- | frontends/kolibrios/fb/gui.c | 20 |
4 files changed, 12 insertions, 16 deletions
diff --git a/frontends/kolibrios/Makefile b/frontends/kolibrios/Makefile index 0a7da7ff7..716166c66 100644 --- a/frontends/kolibrios/Makefile +++ b/frontends/kolibrios/Makefile @@ -5,8 +5,8 @@ KOL_OTHER_INCLUDES := -I$(HOME)/kolibrios/contrib/sdk/sources/libpng/ -I$(HOME)/ CFLAGS += $(KOL_OTHER_INCLUDES) $(DMACROS) -std=c99 -g -CFLAGS += '-DNETSURF_KOLIBRI_FONTPATH="$(NETSURF_KOLIBRI_FONTPATH)"' -CFLAGS += '-DKOLIBRIOS_RESPATH="$(NETSURF_KOLIBRI_RESPATH)"' +# CFLAGS += '-DNETSURF_KOLIBRI_FONTPATH="$(NETSURF_KOLIBRI_FONTPATH)"' +# CFLAGS += '-DKOLIBRIOS_RESPATH="$(NETSURF_KOLIBRI_RESPATH)"' CFLAGS += '-DNETSURF_USE_KOLIBRI_HTTPLIB' ########################################################################## # Only for FB compat with kolibri. Get rid soon. diff --git a/frontends/kolibrios/Makefile.defaults b/frontends/kolibrios/Makefile.defaults index c727c6451..ef51b6cf4 100644 --- a/frontends/kolibrios/Makefile.defaults +++ b/frontends/kolibrios/Makefile.defaults @@ -24,7 +24,7 @@ NETSURF_USE_ROSPRITE := NO # Library to use for font plotting # Valid options: internal, freetype NETSURF_KOLIBRI_FONTLIB := freetype -NETSURF_KOLIBRI_FONTPATH := /usbhd0/1/bin/res/ +# NETSURF_KOLIBRI_FONTPATH := /usbhd0/1/bin/res/ # Default freetype font files NETSURF_KOLIBRI_FONT_SANS_SERIF := sans.ttf diff --git a/frontends/kolibrios/fb/font_freetype.c b/frontends/kolibrios/fb/font_freetype.c index 68a54a384..b12bc9903 100644 --- a/frontends/kolibrios/fb/font_freetype.c +++ b/frontends/kolibrios/fb/font_freetype.c @@ -119,7 +119,7 @@ fb_new_face(const char *option, const char *resname, const char *fontname) fb_faceid_t *newf; FT_Error error; FT_Face aface; - char buf[PATH_MAX]; + char buf[PATH_MAX]; newf = calloc(1, sizeof(fb_faceid_t)); diff --git a/frontends/kolibrios/fb/gui.c b/frontends/kolibrios/fb/gui.c index 90388acda..6d21b737e 100644 --- a/frontends/kolibrios/fb/gui.c +++ b/frontends/kolibrios/fb/gui.c @@ -60,11 +60,6 @@ #define NSFB_TOOLBAR_DEFAULT_LAYOUT "blfsrutc" -/* #undef LOG */ -/* #define LOG(format, args...) \ */ -/* debug_board_printf(format, ##args); \ */ -/* debug_board_printf("\n"); \ */ - fbtk_widget_t *fbtk; static bool fb_complete = false; @@ -493,6 +488,7 @@ process_cmdline(int argc, char** argv) } /* Remove me! */ + /* feurl = "file:///usbhd0/1/bin/res/text.html"; */ feurl = "http://board.kolibrios.org"; /* NS on KolibriOS does not support option parsing (yet) */ @@ -2140,16 +2136,16 @@ int main(int argc, char** argv) /* Initialize heap so that we can do memory allocations */ unsigned int heapsize = heap_init(); - debug_board_printf("[SYSTEM] Initialized heap (Size = %u bytes)\n", heapsize); + LOG("[SYSTEM] Initialized heap (Size = %u bytes)\n", heapsize); assert(heapsize != 0); /* fix args */ -#define MKARGV(i,opt) argv[i] = (char *) malloc(strlen(opt) + 1); strcpy(argv[i], opt); -#define ARGC 3 -MKARGV(1, "-V"); -MKARGV(2, "/tmp0/1/netsurf.log"); -MKARGV(ARGC, "\0"); - argc = ARGC; +/* #define MKARGV(i,opt) argv[i] = (char *) malloc(strlen(opt) + 1); strcpy(argv[i], opt); */ +/* #define ARGC 3 */ +/* MKARGV(1, "-V"); */ +/* MKARGV(2, "/tmp0/1/netsurf.log"); */ +/* MKARGV(ARGC, "\0"); */ +/* argc = ARGC; */ /* args fixed */ /* The only restriction is that the kolibrios-netsurf binary and the res/ directory should be in the same directory. */ |