From 2a6495e8ef0029d2833313034022780660d7004a Mon Sep 17 00:00:00 2001
From: Ashish Gupta <ashmew2@gmail.com>
Date: Wed, 31 May 2017 00:35:19 +0200
Subject: Release nightly for KolibriOS.

Check board.kolibrios.org forum thread for Netsurf for more details.
---
 frontends/kolibrios/Makefile   |  7 +------
 frontends/kolibrios/fb/gui.c   |  6 ++++--
 frontends/kolibrios/kos32sys.h | 13 +++++++++++++
 3 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'frontends')

diff --git a/frontends/kolibrios/Makefile b/frontends/kolibrios/Makefile
index 963b085de..c1496de48 100644
--- a/frontends/kolibrios/Makefile
+++ b/frontends/kolibrios/Makefile
@@ -4,7 +4,7 @@ KOL_OBJ_DIR := $(ENVDIR)/obj
 
 KOL_LIBC := $(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/sources/newlib/libc/include/
 KOL_LIB_DIR := $(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/lib
-LIB_LDFLAGS := -L$(KOL_LIB_DIR) -lfreetype -lpng16 -ljpeg
+LIB_LDFLAGS := -L$(KOL_LIB_DIR) -lfreetype
 OS_LDFLAGS := -static -S -Tapp-dynamic.lds --image-base 0 -Map netsurf-kolibrios.map
 NS_INCLUDE := $(PREFIX)/include
 NS_LIB_LDFLAGS := -L$(PREFIX)/lib/ -lnsbmp -lnsutils -lwapcaplet -lsvgtiny -lnsgif -lutf8proc -lcss -lnsfb -lparserutils -ldom -lhubbub
@@ -22,11 +22,6 @@ CFLAGS += '-DNETSURF_USE_KOLIBRI_HTTPLIB'
 # Only for FB compat with kolibri. Get rid soon.
 CFLAGS += '-DKOLIBRI_RUNTIME_RESPATH="$(NETSURF_KOLIBRI_RESPATH)"'
 
-# Enable PNG and others from here (no pkg config for now)
-CFLAGS += '-DWITH_PNG'
-CFLAGS += '-DWITH_GIF'
-CFLAGS += '-DWITH_JPEG'
-
 # compile time font locations
 CFLAGS += '-DNETSURF_FB_FONTPATH="$(NETSURF_KOLIBRI_FONTPATH)"'
 CFLAGS += '-DKOLIBRI_FONT_FREETYPE_SANS_SERIF="$(NETSURF_KOLIBRI_FONT_SANS_SERIF)"'
diff --git a/frontends/kolibrios/fb/gui.c b/frontends/kolibrios/fb/gui.c
index 6d21b737e..bded72245 100644
--- a/frontends/kolibrios/fb/gui.c
+++ b/frontends/kolibrios/fb/gui.c
@@ -489,7 +489,7 @@ process_cmdline(int argc, char** argv)
 
     /* Remove me! */
     /* feurl = "file:///usbhd0/1/bin/res/text.html"; */
-    feurl = "http://board.kolibrios.org";
+    /* feurl = "http://board.kolibrios.org"; */
 
     /* NS on KolibriOS does not support option parsing (yet) */
 
@@ -2117,6 +2117,8 @@ static struct gui_misc_table framebuffer_misc_table = {
  */
 int main(int argc, char** argv)
 {
+    debug_board_printf("--- [NETSURF] Starting Netsurf for KolibriOS.\n");
+
 	struct browser_window *bw;
 	char *options;
 	char *messages;
@@ -2136,7 +2138,7 @@ int main(int argc, char** argv)
 
     /* Initialize heap so that we can do memory allocations */
     unsigned int heapsize = heap_init();
-    LOG("[SYSTEM] Initialized heap (Size = %u bytes)\n", heapsize);
+    debug_board_printf("--- [NETSURF] Initialized heap.\n");
     assert(heapsize != 0);
 
     /* fix args */
diff --git a/frontends/kolibrios/kos32sys.h b/frontends/kolibrios/kos32sys.h
index de4bf6aae..18ac3fa22 100644
--- a/frontends/kolibrios/kos32sys.h
+++ b/frontends/kolibrios/kos32sys.h
@@ -536,6 +536,19 @@ static inline void Blit(void *bitmap, int dst_x, int dst_y,
     ::"a"(73),"b"(0),"c"(&bc.dstx));
 };
 
+static inline uint32_t sys_uptime(void)
+{
+    uint32_t uptime;
+
+    __asm__ __volatile__(
+      "int $0x40 \n\t"
+      :"=a"(uptime)
+      :"a"(26),"b"(9));
+
+    return uptime / 100;
+}
+
+
 void* load_library(const char *name);
 
 void* get_proc_address(void *handle, const char *proc_name);
-- 
cgit v1.2.3