From 4a731dfda9448aa7fce3a314f92c40ee053cd735 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Sun, 3 Apr 2011 10:56:18 +0200 Subject: [PATCH] Allow for non-GUI win32 apps. --- examples/email/Makefile.win32.defines | 1 + examples/ftp/Makefile.win32.defines | 1 + examples/irc/Makefile.win32.defines | 1 + examples/webbrowser/Makefile.win32.defines | 1 + platform/win32/contiki-main.c | 14 +++++++++++++- 5 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 examples/email/Makefile.win32.defines create mode 100644 examples/ftp/Makefile.win32.defines create mode 100644 examples/irc/Makefile.win32.defines create mode 100644 examples/webbrowser/Makefile.win32.defines diff --git a/examples/email/Makefile.win32.defines b/examples/email/Makefile.win32.defines new file mode 100644 index 000000000..1b5caf200 --- /dev/null +++ b/examples/email/Makefile.win32.defines @@ -0,0 +1 @@ +DEFINES = WITH_GUI diff --git a/examples/ftp/Makefile.win32.defines b/examples/ftp/Makefile.win32.defines new file mode 100644 index 000000000..1b5caf200 --- /dev/null +++ b/examples/ftp/Makefile.win32.defines @@ -0,0 +1 @@ +DEFINES = WITH_GUI diff --git a/examples/irc/Makefile.win32.defines b/examples/irc/Makefile.win32.defines new file mode 100644 index 000000000..1b5caf200 --- /dev/null +++ b/examples/irc/Makefile.win32.defines @@ -0,0 +1 @@ +DEFINES = WITH_GUI diff --git a/examples/webbrowser/Makefile.win32.defines b/examples/webbrowser/Makefile.win32.defines new file mode 100644 index 000000000..1b5caf200 --- /dev/null +++ b/examples/webbrowser/Makefile.win32.defines @@ -0,0 +1 @@ +DEFINES = WITH_GUI diff --git a/platform/win32/contiki-main.c b/platform/win32/contiki-main.c index 19bd8309f..0e170f4b5 100644 --- a/platform/win32/contiki-main.c +++ b/platform/win32/contiki-main.c @@ -54,9 +54,15 @@ #include "program-handler.h" #endif /* PLATFORM_BUILD */ +#if WITH_GUI +#define CTK_PROCESS &ctk_process, +#else /* WITH_GUI */ +#define CTK_PROCESS +#endif /* WITH_GUI */ + PROCINIT(&etimer_process, &wpcap_process, - &ctk_process, + CTK_PROCESS &tcpip_process, &resolv_process); @@ -71,7 +77,11 @@ debug_printf(char *format, ...) vsprintf(buffer, format, argptr); va_end(argptr); +#if WITH_GUI OutputDebugString(buffer); +#else /* WITH_GUI */ + fputs(buffer, stderr); +#endif /* WITH_GUI */ } /*-----------------------------------------------------------------------------------*/ void @@ -130,9 +140,11 @@ main(void) /* Allow user-mode APC to execute. */ SleepEx(10, TRUE); +#if WITH_GUI if(console_resize()) { ctk_restore(); } +#endif /* WITH_GUI */ } } /*-----------------------------------------------------------------------------------*/