summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshish Gupta <ashmew2@gmail.com>2017-09-12 17:33:33 (GMT)
committer Ashish Gupta <ashmew2@gmail.com>2017-09-12 17:59:04 (GMT)
commit72ad484cf5ac767353e6d8f6586e266a7199c684 (patch)
tree5a6d58727adea9fff2cddf780d6bc6cabed89fd6
parent3a0ff4a6a40a4f62dabfc71b2d0ff6e71e94fddf (diff)
downloadnetsurf-72ad484cf5ac767353e6d8f6586e266a7199c684.tar.gz
netsurf-72ad484cf5ac767353e6d8f6586e266a7199c684.tar.bz2
Add old work to rebase bucket.
-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 cc50893..b4aa116 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 bded722..15bb97a 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;