1 files changed, 10 insertions, 3 deletions

diff --git a/apps/main.c b/apps/main.c
index b043dacede..e4b9286b4e 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -124,8 +124,14 @@ const char appsversion[]=APPSVERSION;
 
 static void init(void);
 
-#ifdef SIMULATOR
-void app_main(void)
+#ifdef HAVE_SDL
+#if defined(WIN32) && defined(main)
+/* Don't use SDL_main on windows -> no more stdio redirection */
+#undef main
+#endif
+int main(int argc, char *argv[])
+{
+    sys_handle_argv(argc, argv);
 #else
 /* main(), and various functions called by main() and init() may be
  * be INIT_ATTR. These functions must not be called after the final call
@@ -133,8 +139,8 @@ void app_main(void)
  * see definition of INIT_ATTR in config.h */
 int main(void)  INIT_ATTR __attribute__((noreturn));
 int main(void)
-#endif
 {
+#endif
     int i;
     CHART(">init");
     init();
@@ -313,6 +319,7 @@ static void init_tagcache(void)
 
 static void init(void)
 {
+    system_init();
     kernel_init();
     buffer_init();
     enable_irq();