summaryrefslogtreecommitdiff
path: root/frontends
diff options
context:
space:
mode:
authorAshish Gupta <ashmew2@gmail.com>2017-09-12 19:33:33 +0200
committerAshish Gupta <ashmew2@gmail.com>2017-10-25 22:04:55 +0200
commit32c281e79aef8d384f76aab8851e44f273ad49e8 (patch)
treef3b92d8ed103b9e98d4dcb0622dc07c314063dcd /frontends
parentfea980a791f8bfe2b4dc1cdc57f57fa42da4ca10 (diff)
downloadnetsurf-32c281e79aef8d384f76aab8851e44f273ad49e8.tar.gz
netsurf-32c281e79aef8d384f76aab8851e44f273ad49e8.tar.bz2
Add old work to rebase bucket.
Diffstat (limited to 'frontends')
-rw-r--r--frontends/kolibrios/Makefile4
-rw-r--r--frontends/kolibrios/fb/gui.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/frontends/kolibrios/Makefile b/frontends/kolibrios/Makefile
index cc508933c..b4aa11672 100644
--- a/frontends/kolibrios/Makefile
+++ b/frontends/kolibrios/Makefile
@@ -4,8 +4,8 @@ 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
-OS_LDFLAGS := -static -S -Tapp-dynamic.lds --image-base 0 -Map netsurf-kolibrios.map
+LIB_LDFLAGS := -L$(KOL_LIB_DIR) -L/opt/netsurf/kos32-gcc/cross/autobuild/tools/win32/lib -lfreetype
+OS_LDFLAGS := -static -S -T$(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/sources/newlib/app-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
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)
diff --git a/frontends/kolibrios/fb/gui.c b/frontends/kolibrios/fb/gui.c
index bded72245..15bb97ae3 100644
--- a/frontends/kolibrios/fb/gui.c
+++ b/frontends/kolibrios/fb/gui.c
@@ -2117,6 +2117,7 @@ static struct gui_misc_table framebuffer_misc_table = {
*/
int main(int argc, char** argv)
{
+ __asm__ __volatile__("int3");
debug_board_printf("--- [NETSURF] Starting Netsurf for KolibriOS.\n");
struct browser_window *bw;