* configure.ac, src/vlc.c: WinCE build fixes.

diff --git a/configure.ac b/configure.ac
index 59fda816dcd1c3d79ea56bdf0d576738bd5f22b3..1b1b9ae7ea68e903c11990e288f858817f5d6292 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -162,6 +162,7 @@ case "${target_os}" in
     if test "${SYS}" = "mingwce"; then
         # add ws2 for closesocket, select, recv
         CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}"
+        VLC_ADD_CPPFLAGS([vlc],[-Dmain=maince])
         VLC_ADD_LDFLAGS([vlc],[-lws2 -e WinMainCRTStartup])
         VLC_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_tcp access_ftp access_output_udp sap http netsync],[-lws2])
     fi

diff --git a/src/vlc.c b/src/vlc.c
index 6308970931d3cd6841cf386b3ac6b67d67be8547..b7870470188238afddd8e5202470d741f9af35d7 100644 (file)
--- a/src/vlc.c
+++ b/src/vlc.c
@@ -157,7 +157,9 @@ static void SigHandler( int i_signal )
 #endif
 
 #if defined(UNDER_CE)
-#include "vlc_common.h"
+#   if defined( _MSC_VER ) && defined( UNDER_CE )
+#       include "vlc_common.h"
+#   endif
 /*****************************************************************************
  * WinMain: parse command line, start interface and spawn threads. (WinCE only)
  *****************************************************************************/