Allow for non-GUI win32 apps.

ibriano · Apr 3, 2011 · 4a731df · 4a731df
1 parent 26f0a6e
commit 4a731df
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 1 deletion.
diff --git a/examples/email/Makefile.win32.defines 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
@@ -0,0 +1 @@
+DEFINES = WITH_GUI
diff --git a/examples/irc/Makefile.win32.defines 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
@@ -0,0 +1 @@
+DEFINES = WITH_GUI
diff --git 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 */
   }
 }
 /*-----------------------------------------------------------------------------------*/