Commit a7b2dcf0 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove WinCE

parent a5b8b24f
...@@ -14,20 +14,15 @@ AM_CFLAGS = $(CFLAGS_vlc) ...@@ -14,20 +14,15 @@ AM_CFLAGS = $(CFLAGS_vlc)
if !HAVE_WIN32 if !HAVE_WIN32
if !HAVE_WINCE
bin_PROGRAMS += vlc-wrapper bin_PROGRAMS += vlc-wrapper
vlc_SOURCES = vlc.c override.c vlc_SOURCES = vlc.c override.c
endif endif
endif
EXTRA_vlc_SOURCES = vlc.c winvlc.c EXTRA_vlc_SOURCES = vlc.c winvlc.c
if HAVE_WIN32 if HAVE_WIN32
vlc_SOURCES = winvlc.c vlc_SOURCES = winvlc.c
noinst_DATA += vlc_win32_rc.rc noinst_DATA += vlc_win32_rc.rc
endif endif
if HAVE_WINCE
vlc_SOURCES = winvlc.c
endif
vlc_wrapper_SOURCES = rootwrap.c vlc_wrapper_SOURCES = rootwrap.c
vlc_wrapper_LDADD = $(SOCKET_LIBS) vlc_wrapper_LDADD = $(SOCKET_LIBS)
......
...@@ -33,23 +33,20 @@ ...@@ -33,23 +33,20 @@
#include <windows.h> #include <windows.h>
#include <shellapi.h> #include <shellapi.h>
#if !defined(UNDER_CE) #ifndef _WIN32_IE
# ifndef _WIN32_IE # define _WIN32_IE 0x501
# define _WIN32_IE 0x501 #endif
# endif #include <fcntl.h>
# include <fcntl.h> #include <io.h>
# include <io.h> #include <shlobj.h>
# include <shlobj.h> #include <wininet.h>
# include <wininet.h> #define PSAPI_VERSION 1
# define PSAPI_VERSION 1 #include <psapi.h>
# include <psapi.h> #define HeapEnableTerminationOnCorruption (HEAP_INFORMATION_CLASS)1
# define HeapEnableTerminationOnCorruption (HEAP_INFORMATION_CLASS)1
static void check_crashdump(void); static void check_crashdump(void);
LONG WINAPI vlc_exception_filter(struct _EXCEPTION_POINTERS *lpExceptionInfo); LONG WINAPI vlc_exception_filter(struct _EXCEPTION_POINTERS *lpExceptionInfo);
static const wchar_t *crashdump_path; static const wchar_t *crashdump_path;
#endif
#ifndef UNDER_CE
static char *FromWide (const wchar_t *wide) static char *FromWide (const wchar_t *wide)
{ {
size_t len; size_t len;
...@@ -60,67 +57,13 @@ static char *FromWide (const wchar_t *wide) ...@@ -60,67 +57,13 @@ static char *FromWide (const wchar_t *wide)
WideCharToMultiByte (CP_UTF8, 0, wide, -1, out, len, NULL, NULL); WideCharToMultiByte (CP_UTF8, 0, wide, -1, out, len, NULL, NULL);
return out; return out;
} }
#else
static int parse_cmdline (char *line, char ***argvp)
{
char **argv = malloc (sizeof (char *));
int argc = 0;
while (*line != '\0')
{
char quote = 0;
/* Skips white spaces */
while (strchr ("\t ", *line))
line++;
if (!*line)
break;
/* Starts a new parameter */
argv = realloc (argv, (argc + 2) * sizeof (char *));
if (*line == '"')
{
quote = '"';
line++;
}
argv[argc++] = line;
more:
while (*line && !strchr ("\t ", *line))
line++;
if (line > argv[argc - 1] && line[-1] == quote)
/* End of quoted parameter */
line[-1] = 0;
else
if (*line && quote)
{
/* Space within a quote */
line++;
goto more;
}
else
/* End of unquoted parameter */
if (*line)
*line++ = 0;
}
argv[argc] = NULL;
*argvp = argv;
return argc;
}
#endif
int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
#ifndef UNDER_CE
LPSTR lpCmdLine, LPSTR lpCmdLine,
#else
LPWSTR lpCmdLine,
#endif
int nCmdShow ) int nCmdShow )
{ {
int argc; int argc;
#ifndef UNDER_CE
/* VLC does not change the thread locale, so gettext/libintil will use the /* VLC does not change the thread locale, so gettext/libintil will use the
* user default locale as reference. */ * user default locale as reference. */
/* gettext versions 0.18-0.18.1 will use the Windows Vista locale name /* gettext versions 0.18-0.18.1 will use the Windows Vista locale name
...@@ -198,15 +141,6 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, ...@@ -198,15 +141,6 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
_setmode( STDIN_FILENO, _O_BINARY ); /* Needed for pipes */ _setmode( STDIN_FILENO, _O_BINARY ); /* Needed for pipes */
#else /* UNDER_CE */
char **argv, psz_cmdline[wcslen(lpCmdLine) * 4];
WideCharToMultiByte( CP_UTF8, 0, lpCmdLine, -1,
psz_cmdline, sizeof (psz_cmdline), NULL, NULL );
argc = parse_cmdline (psz_cmdline, &argv);
#endif
/* Initialize libvlc */ /* Initialize libvlc */
libvlc_instance_t *vlc; libvlc_instance_t *vlc;
vlc = libvlc_new (argc, (const char **)argv); vlc = libvlc_new (argc, (const char **)argv);
...@@ -227,7 +161,6 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, ...@@ -227,7 +161,6 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
return 0; return 0;
} }
#if !defined( UNDER_CE )
/* Crashdumps handling */ /* Crashdumps handling */
static void check_crashdump(void) static void check_crashdump(void)
{ {
...@@ -402,4 +335,3 @@ LONG WINAPI vlc_exception_filter(struct _EXCEPTION_POINTERS *lpExceptionInfo) ...@@ -402,4 +335,3 @@ LONG WINAPI vlc_exception_filter(struct _EXCEPTION_POINTERS *lpExceptionInfo)
exit( 1 ); exit( 1 );
} }
} }
#endif
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
int fsync (int fd) int fsync (int fd)
{ {
#if defined(WIN32) && !defined(UNDER_CE) #if defined(WIN32)
/* WinCE can use FlushFileBuffers() but it operates on file handles */ /* WinCE can use FlushFileBuffers() but it operates on file handles */
return _commit (fd); return _commit (fd);
#else #else
......
...@@ -209,10 +209,6 @@ case "${host_os}" in ...@@ -209,10 +209,6 @@ case "${host_os}" in
AC_DEFINE([_WIN32_IE], 0x0600, [Define to '0x0600' for IE 6.0 (and shell) APIs.]) AC_DEFINE([_WIN32_IE], 0x0600, [Define to '0x0600' for IE 6.0 (and shell) APIs.])
case "${host_os}" in case "${host_os}" in
*wince* | *mingwce* | *mingw32ce*)
SYS=mingwce
dnl Sadly CeGCC still needs non-wince macros
;;
*mingw32*) *mingw32*)
SYS=mingw32 SYS=mingw32
;; ;;
...@@ -251,12 +247,6 @@ case "${host_os}" in ...@@ -251,12 +247,6 @@ case "${host_os}" in
AC_SUBST(PROGRAMFILES) AC_SUBST(PROGRAMFILES)
fi fi
if test "${SYS}" = "mingwce"; then
VLC_ADD_LIBS([libvlccore],[-lmmtimer])
AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
ac_default_prefix="`pwd`/_wince"
DESTDIR="`pwd`/_wince/"
fi
;; ;;
*nto*) *nto*)
SYS=nto SYS=nto
...@@ -283,7 +273,6 @@ AM_CONDITIONAL(HAVE_LINUX, test "${SYS}" = "linux") ...@@ -283,7 +273,6 @@ AM_CONDITIONAL(HAVE_LINUX, test "${SYS}" = "linux")
AM_CONDITIONAL(HAVE_OS2, test "${SYS}" = "os2") AM_CONDITIONAL(HAVE_OS2, test "${SYS}" = "os2")
AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32") AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1") AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1")
AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce")
AM_CONDITIONAL(HAVE_SYMBIAN, test "${SYS}" = "symbian") AM_CONDITIONAL(HAVE_SYMBIAN, test "${SYS}" = "symbian")
dnl dnl
...@@ -422,7 +411,7 @@ dnl ...@@ -422,7 +411,7 @@ dnl
AM_ICONV AM_ICONV
dnl Check for broken versions of mingw-runtime compatability library dnl Check for broken versions of mingw-runtime compatability library
AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [ AS_IF([test "${SYS}" = "mingw32"], [
AC_MSG_CHECKING(for broken mingw-runtime) AC_MSG_CHECKING(for broken mingw-runtime)
AC_PREPROC_IFELSE([AC_LANG_SOURCE([ AC_PREPROC_IFELSE([AC_LANG_SOURCE([
#include <_mingw.h> #include <_mingw.h>
...@@ -567,9 +556,6 @@ AC_SEARCH_LIBS(connect, [socket], [ ...@@ -567,9 +556,6 @@ AC_SEARCH_LIBS(connect, [socket], [
AS_IF([test "${SYS}" = "mingw32"], [ AS_IF([test "${SYS}" = "mingw32"], [
SOCKET_LIBS="-lws2_32" SOCKET_LIBS="-lws2_32"
]) ])
AS_IF([test "${SYS}" = "mingwce"], [
SOCKET_LIBS="-lws2"
])
]) ])
AC_SEARCH_LIBS([getaddrinfo], [nsl], [ AC_SEARCH_LIBS([getaddrinfo], [nsl], [
...@@ -609,9 +595,7 @@ AH_TEMPLATE(ss_family, [Define to `sa_family' if <sys/socket.h> does not define. ...@@ -609,9 +595,7 @@ AH_TEMPLATE(ss_family, [Define to `sa_family' if <sys/socket.h> does not define.
AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_struct_sockaddr_storage, AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_struct_sockaddr_storage,
[AC_TRY_COMPILE( [AC_TRY_COMPILE(
[#include <sys/types.h> [#include <sys/types.h>
#if defined( UNDER_CE ) #if defined( WIN32 )
# include <winsock2.h>
#elif defined( WIN32 )
# include <winsock2.h> # include <winsock2.h>
#else #else
# include <sys/socket.h> # include <sys/socket.h>
...@@ -658,7 +642,7 @@ AC_SEARCH_LIBS(dlopen, [dl svld], [ ...@@ -658,7 +642,7 @@ AC_SEARCH_LIBS(dlopen, [dl svld], [
VLC_RESTORE_FLAGS VLC_RESTORE_FLAGS
# Windows # Windows
AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [ AS_IF([test "${SYS}" = "mingw32"], [
LIBDL="" LIBDL=""
have_dynamic_objects="yes" #assume we can use shared objects have_dynamic_objects="yes" #assume we can use shared objects
]) ])
...@@ -678,7 +662,7 @@ AC_SUBST(LIBDL) ...@@ -678,7 +662,7 @@ AC_SUBST(LIBDL)
VLC_ADD_LIBS([lua],[$LIBDL]) VLC_ADD_LIBS([lua],[$LIBDL])
dnl Check for thread library dnl Check for thread library
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then if test "${SYS}" != "mingw32"; then
VLC_SAVE_FLAGS VLC_SAVE_FLAGS
LIBS="" LIBS=""
...@@ -702,7 +686,7 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then ...@@ -702,7 +686,7 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
dnl HP/UX port dnl HP/UX port
AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LIBS([libvlccore],[-lrt])]) AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LIBS([libvlccore],[-lrt])])
]) ])
fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" fi # end "${SYS}" != "mingw32"
dnl Check for headers dnl Check for headers
AC_CHECK_HEADERS([search.h]) AC_CHECK_HEADERS([search.h])
...@@ -719,11 +703,11 @@ AC_CHECK_HEADERS([sys/mount.h], [], [], ...@@ -719,11 +703,11 @@ AC_CHECK_HEADERS([sys/mount.h], [], [],
#include <sys/param.h> #include <sys/param.h>
]) ])
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then if test "${SYS}" != "mingw32"; then
AC_CHECK_HEADERS(machine/param.h sys/shm.h) AC_CHECK_HEADERS(machine/param.h sys/shm.h)
AC_CHECK_HEADERS([linux/version.h linux/dccp.h scsi/scsi.h linux/magic.h]) AC_CHECK_HEADERS([linux/version.h linux/dccp.h scsi/scsi.h linux/magic.h])
AC_CHECK_HEADERS(syslog.h mntent.h) AC_CHECK_HEADERS(syslog.h mntent.h)
fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" fi # end "${SYS}" != "mingw32"
dnl LP64 and LLP64 architectures had better define ssize_t by themselves... dnl LP64 and LLP64 architectures had better define ssize_t by themselves...
AH_TEMPLATE(ssize_t, [Define to `int' if <stddef.h> does not define.]) dnl ` (fix VIM syntax highlight AH_TEMPLATE(ssize_t, [Define to `int' if <stddef.h> does not define.]) dnl ` (fix VIM syntax highlight
...@@ -732,9 +716,9 @@ AC_CHECK_TYPE(ssize_t,, [ ...@@ -732,9 +716,9 @@ AC_CHECK_TYPE(ssize_t,, [
]) ])
dnl Check for threads library dnl Check for threads library
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then if test "${SYS}" != "mingw32"; then
AC_CHECK_HEADERS(pthread.h) AC_CHECK_HEADERS(pthread.h)
fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" fi # end "${SYS}" != "mingw32"
dnl It seems that autoconf detects pkg-config only during the first dnl It seems that autoconf detects pkg-config only during the first
dnl PKG_CHECK_MODULES from configure.ac - which makes sense. But in our case, dnl PKG_CHECK_MODULES from configure.ac - which makes sense. But in our case,
...@@ -746,7 +730,7 @@ PKG_PROG_PKG_CONFIG() ...@@ -746,7 +730,7 @@ PKG_PROG_PKG_CONFIG()
dnl On some OS we need static linking dnl On some OS we need static linking
AS_IF([test -n "${PKG_CONFIG}" ],[ AS_IF([test -n "${PKG_CONFIG}" ],[
AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" -o "${SYS}" = "darwin" -o "${SYS}" = "os2" ],[ AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "darwin" -o "${SYS}" = "os2" ],[
PKG_CONFIG="${PKG_CONFIG} --static" PKG_CONFIG="${PKG_CONFIG} --static"
]) ])
]) ])
...@@ -793,7 +777,7 @@ AC_ARG_ENABLE(dbus, ...@@ -793,7 +777,7 @@ AC_ARG_ENABLE(dbus,
[compile D-Bus message bus support (default enabled)])]) [compile D-Bus message bus support (default enabled)])])
case "${SYS}" in case "${SYS}" in
linux*|*bsd*) linux*|*bsd*)
if test "${enable_dbus}" != "no" -a "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" if test "${enable_dbus}" != "no" -a "${SYS}" != "mingw32"
then then
dnl api stable dbus dnl api stable dbus
PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0.0], PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0.0],
...@@ -896,7 +880,7 @@ AS_IF([test "${enable_coverage}" != "no"], [ ...@@ -896,7 +880,7 @@ AS_IF([test "${enable_coverage}" != "no"], [
LDFLAGS="-lgcov ${LDFLAGS}" LDFLAGS="-lgcov ${LDFLAGS}"
]) ])
AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [ AS_IF([test "${SYS}" != "mingw32"], [
VLC_SAVE_FLAGS VLC_SAVE_FLAGS
CFLAGS="${CFLAGS} -fvisibility=hidden" CFLAGS="${CFLAGS} -fvisibility=hidden"
CXXFLAGS="${CXXFLAGS} -fvisibility=hidden" CXXFLAGS="${CXXFLAGS} -fvisibility=hidden"
...@@ -1076,13 +1060,9 @@ dnl Some plugins aren't useful on some platforms ...@@ -1076,13 +1060,9 @@ dnl Some plugins aren't useful on some platforms
dnl dnl
if test "${SYS}" = "os2"; then if test "${SYS}" = "os2"; then
VLC_ADD_PLUGIN([dynamicoverlay]) VLC_ADD_PLUGIN([dynamicoverlay])
elif test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then elif test "${SYS}" != "mingw32"; then
VLC_ADD_PLUGIN([dynamicoverlay access_shm]) VLC_ADD_PLUGIN([dynamicoverlay access_shm])
elif test "${SYS}" != "mingwce"; then elif test "${SYS}" = "darwin"; then
VLC_ADD_PLUGIN([access_smb dmo globalhotkeys])
VLC_ADD_LIBS([dmo],[-lole32 -luuid])
fi
if test "${SYS}" = "darwin"; then
VLC_ADD_LIBS([quartztext],[-Wl,-framework,ApplicationServices]) VLC_ADD_LIBS([quartztext],[-Wl,-framework,ApplicationServices])
fi fi
...@@ -1664,9 +1644,6 @@ You can get an updated one from http://www.live555.com/liveMedia .]) ...@@ -1664,9 +1644,6 @@ You can get an updated one from http://www.live555.com/liveMedia .])
AS_IF([test "${SYS}" = "mingw32"], [ AS_IF([test "${SYS}" = "mingw32"], [
# add ws2_32 for closesocket, select, recv # add ws2_32 for closesocket, select, recv
other_libs="$other_libs -lws2_32" other_libs="$other_libs -lws2_32"
], [test "${SYS}" = "mingwce"], [
# add ws2 for closesocket, select, recv
other_libs="$other_libs -lws2"
]) ])
dnl We need to check for pic because live555 don't provide shared libs dnl We need to check for pic because live555 don't provide shared libs
...@@ -3011,7 +2988,7 @@ dnl X C Bindings modules ...@@ -3011,7 +2988,7 @@ dnl X C Bindings modules
dnl dnl
AC_ARG_ENABLE(xcb, AC_ARG_ENABLE(xcb,
[ --enable-xcb X11 support with XCB (default enabled)],, [ [ --enable-xcb X11 support with XCB (default enabled)],, [
AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "darwin" -a "${SYS}" != "symbian"], [ AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "darwin" -a "${SYS}" != "symbian"], [
enable_xcb="yes" enable_xcb="yes"
], [ ], [
enable_xcb="no" enable_xcb="no"
...@@ -3214,7 +3191,7 @@ dnl ...@@ -3214,7 +3191,7 @@ dnl
dnl Windows DirectX module dnl Windows DirectX module
dnl dnl
if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" if test "${SYS}" = "mingw32"
then then
VLC_ADD_PLUGIN([panoramix]) VLC_ADD_PLUGIN([panoramix])
fi fi
...@@ -3222,7 +3199,7 @@ fi ...@@ -3222,7 +3199,7 @@ fi
AC_ARG_ENABLE(directx, AC_ARG_ENABLE(directx,
[AS_HELP_STRING([--enable-directx], [AS_HELP_STRING([--enable-directx],
[Microsoft DirectX support (default enabled on Windows)])],, [ [Microsoft DirectX support (default enabled on Windows)])],, [
AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [ AS_IF([test "${SYS}" = "mingw32"], [
enable_directx="yes" enable_directx="yes"
], [ ], [
enable_directx="no" enable_directx="no"
...@@ -3260,7 +3237,7 @@ dnl Windows Direct2D plugin ...@@ -3260,7 +3237,7 @@ dnl Windows Direct2D plugin
dnl dnl
AC_ARG_ENABLE(direct2d, AC_ARG_ENABLE(direct2d,
[ --enable-direct2d Win7/VistaPU Direct2D support (default auto on Win32)],, [ [ --enable-direct2d Win7/VistaPU Direct2D support (default auto on Win32)],, [
AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [ AS_IF([test "${SYS}" != "mingw32"], [
enable_direct2d="no" enable_direct2d="no"
]) ])
]) ])
...@@ -3283,11 +3260,6 @@ if test "${enable_wingdi}" != "no"; then ...@@ -3283,11 +3260,6 @@ if test "${enable_wingdi}" != "no"; then
VLC_ADD_PLUGIN([wingdi]) VLC_ADD_PLUGIN([wingdi])
VLC_ADD_LIBS([wingdi],[-lgdi32 -lole32 -luuid]) VLC_ADD_LIBS([wingdi],[-lgdi32 -lole32 -luuid])
fi fi
if test "${SYS}" = "mingwce"; then
VLC_ADD_PLUGIN([wingdi wingapi])
VLC_ADD_LIBS([wingdi],[-laygshell])
VLC_ADD_LIBS([wingapi],[-laygshell])
fi
fi fi
...@@ -3473,7 +3445,7 @@ dnl ...@@ -3473,7 +3445,7 @@ dnl
AC_ARG_ENABLE(oss, AC_ARG_ENABLE(oss,
[AS_HELP_STRING([--enable-oss], [AS_HELP_STRING([--enable-oss],
[support the Open Sound System OSS (default enabled on FreeBSD/NetBSD/DragonFlyBSD)])],, [ [support the Open Sound System OSS (default enabled on FreeBSD/NetBSD/DragonFlyBSD)])],, [
AS_IF([test "$SYS" = "mingw32" -o "$SYS" = "mingwce" -o "$SYS" = "linux" -o "$SYS" = "openbsd"], [ AS_IF([test "$SYS" = "mingw32" -o "$SYS" = "linux" -o "$SYS" = "openbsd"], [
enable_oss="no" enable_oss="no"
]) ])
]) ])
...@@ -3537,9 +3509,6 @@ if test "${enable_waveout}" != "no"; then ...@@ -3537,9 +3509,6 @@ if test "${enable_waveout}" != "no"; then
VLC_ADD_PLUGIN([waveout]) VLC_ADD_PLUGIN([waveout])
VLC_ADD_LIBS([waveout],[-lwinmm]) VLC_ADD_LIBS([waveout],[-lwinmm])
fi fi
if test "${SYS}" = "mingwce"; then
VLC_ADD_PLUGIN([waveout])
fi
fi fi
dnl dnl
...@@ -3667,7 +3636,7 @@ AS_IF([test "${enable_qt}" != "no"], [ ...@@ -3667,7 +3636,7 @@ AS_IF([test "${enable_qt}" != "no"], [
VLC_RESTORE_FLAGS VLC_RESTORE_FLAGS
AC_LANG_POP([C++]) AC_LANG_POP([C++])
AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [ AS_IF([test "${SYS}" = "mingw32"], [
VLC_ADD_LIBS([qt4],[-lole32]) VLC_ADD_LIBS([qt4],[-lole32])
]) ])
AS_IF([test "${SYS}" = "darwin" ],[ AS_IF([test "${SYS}" = "darwin" ],[
...@@ -4082,7 +4051,7 @@ AC_ARG_WITH(kde-solid, ...@@ -4082,7 +4051,7 @@ AC_ARG_WITH(kde-solid,
AS_HELP_STRING([--with-kde-solid=PATH], AS_HELP_STRING([--with-kde-solid=PATH],
[KDE Solid actions directory (auto)]),, [ [KDE Solid actions directory (auto)]),, [
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "darwin" ; then if test "${SYS}" != "mingw32" -a "${SYS}" != "darwin" ; then
with_kde_solid="yes" with_kde_solid="yes"
fi fi
]) ])
......
...@@ -10,14 +10,9 @@ win32_xpi_destdir=$(abs_top_builddir)/vlc-plugin-$(VERSION) ...@@ -10,14 +10,9 @@ win32_xpi_destdir=$(abs_top_builddir)/vlc-plugin-$(VERSION)
7Z_OPTS=-t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on 7Z_OPTS=-t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on
if HAVE_WINCE
build-npapi:
touch $@
else
if HAVE_WIN32 if HAVE_WIN32
include extras/package/npapi.am include extras/package/npapi.am
endif endif
endif
if HAVE_WIN64 if HAVE_WIN64
WINVERSION=vlc-$(VERSION)-win64 WINVERSION=vlc-$(VERSION)-win64
...@@ -67,12 +62,10 @@ if BUILD_OSDMENU ...@@ -67,12 +62,10 @@ if BUILD_OSDMENU
done done
endif endif
if !HAVE_WINCE
cp "$(top_builddir)/npapi-vlc/activex/axvlc.dll.manifest" "$(win32_destdir)/" cp "$(top_builddir)/npapi-vlc/activex/axvlc.dll.manifest" "$(win32_destdir)/"
cp "$(top_builddir)/npapi-vlc/installed/lib/axvlc.dll" "$(win32_destdir)/" cp "$(top_builddir)/npapi-vlc/installed/lib/axvlc.dll" "$(win32_destdir)/"
cp "$(top_builddir)/npapi-vlc/npapi/npvlc.dll.manifest" "$(win32_destdir)/" cp "$(top_builddir)/npapi-vlc/npapi/npvlc.dll.manifest" "$(win32_destdir)/"
cp "$(top_builddir)/npapi-vlc/installed/lib/npvlc.dll" "$(win32_destdir)/" cp "$(top_builddir)/npapi-vlc/installed/lib/npvlc.dll" "$(win32_destdir)/"
endif
# Compiler shared DLLs, when using compilers built with --enable-shared # Compiler shared DLLs, when using compilers built with --enable-shared
# If gcc_s_sjlj/stdc++-6 DLLs exist, our C++ modules were linked to them # If gcc_s_sjlj/stdc++-6 DLLs exist, our C++ modules were linked to them
...@@ -84,13 +77,11 @@ endif ...@@ -84,13 +77,11 @@ endif
cp -r $(prefix)/include "$(win32_destdir)/sdk" cp -r $(prefix)/include "$(win32_destdir)/sdk"
cp -r $(prefix)/lib/pkgconfig "$(win32_destdir)/sdk/lib" cp -r $(prefix)/lib/pkgconfig "$(win32_destdir)/sdk/lib"
cd $(prefix)/lib && cp -rv libvlc.dll.a libvlc.la libvlccore.dll.a libvlccore.la "$(win32_destdir)/sdk/lib/" cd $(prefix)/lib && cp -rv libvlc.dll.a libvlc.la libvlccore.dll.a libvlccore.la "$(win32_destdir)/sdk/lib/"
if !HAVE_WINCE
$(DLLTOOL) -D libvlc.dll -l "$(win32_destdir)/sdk/lib/libvlc.lib" -d "$(top_builddir)/lib/.libs/libvlc.dll.def" "$(prefix)/bin/libvlc.dll" $(DLLTOOL) -D libvlc.dll -l "$(win32_destdir)/sdk/lib/libvlc.lib" -d "$(top_builddir)/lib/.libs/libvlc.dll.def" "$(prefix)/bin/libvlc.dll"
$(DLLTOOL) -D libvlccore.dll -l "$(win32_destdir)/sdk/lib/libvlccore.lib" -d "$(top_builddir)/src/.libs/libvlccore.dll.def" "$(prefix)/bin/libvlccore.dll" $(DLLTOOL) -D libvlccore.dll -l "$(win32_destdir)/sdk/lib/libvlccore.lib" -d "$(top_builddir)/src/.libs/libvlccore.dll.def" "$(prefix)/bin/libvlccore.dll"
mkdir -p "$(win32_destdir)/sdk/activex/" mkdir -p "$(win32_destdir)/sdk/activex/"
cd $(top_builddir)/npapi-vlc && cp activex/README.TXT share/test.html $(win32_destdir)/sdk/activex/ cd $(top_builddir)/npapi-vlc && cp activex/README.TXT share/test.html $(win32_destdir)/sdk/activex/
endif
# Convert to DOS line endings # Convert to DOS line endings
find $(win32_destdir) -type f \( -name "*xml" -or -name "*html" -or -name '*js' -or -name '*css' -or -name '*hosts' -or -iname '*txt' -or -name '*.cfg' -or -name '*.lua' \) -exec $(U2D) {} \; find $(win32_destdir) -type f \( -name "*xml" -or -name "*html" -or -name '*js' -or -name '*css' -or -name '*hosts' -or -iname '*txt' -or -name '*.cfg' -or -name '*.lua' \) -exec $(U2D) {} \;
......
...@@ -40,7 +40,7 @@ static inline void *realloc_down( void *ptr, size_t size ) ...@@ -40,7 +40,7 @@ static inline void *realloc_down( void *ptr, size_t size )
/** /**
* Simple dynamic array handling. Array is realloced at each insert/removal * Simple dynamic array handling. Array is realloced at each insert/removal
*/ */
#if defined( _MSC_VER ) && _MSC_VER < 1300 && !defined( UNDER_CE ) #if defined( _MSC_VER ) && _MSC_VER < 1300
# define VLCCVP (void**) /* Work-around for broken compiler */ # define VLCCVP (void**) /* Work-around for broken compiler */
#else #else
# define VLCCVP # define VLCCVP
......
...@@ -65,15 +65,13 @@ static inline void vlc_rewinddir( DIR *dir ) ...@@ -65,15 +65,13 @@ static inline void vlc_rewinddir( DIR *dir )
# define rewinddir vlc_rewinddir # define rewinddir vlc_rewinddir
# include <sys/stat.h> # include <sys/stat.h>
# ifndef UNDER_CE # ifndef stat
# ifndef stat # define stat _stati64
# define stat _stati64
# endif
# ifndef fstat
# define fstat _fstati64
# endif
# define lseek _lseeki64
# endif # endif
# ifndef fstat
# define fstat _fstati64
# endif
#define lseek _lseeki64
#endif #endif
#ifdef __ANDROID__ #ifdef __ANDROID__
......
...@@ -126,7 +126,7 @@ VLC_API void vlc_Unsubscribe(msg_subscription_t *); ...@@ -126,7 +126,7 @@ VLC_API void vlc_Unsubscribe(msg_subscription_t *);
/*@}*/ /*@}*/
#if defined( WIN32 ) && !defined( UNDER_CE ) #if defined( WIN32 )
# define CONSOLE_INTRO_MSG \ # define CONSOLE_INTRO_MSG \
if( !getenv( "PWD" ) ) /* detect Cygwin shell or Wine */ \ if( !getenv( "PWD" ) ) /* detect Cygwin shell or Wine */ \
{ \ { \
......
...@@ -33,10 +33,8 @@ ...@@ -33,10 +33,8 @@
*/ */
#if defined( WIN32 ) #if defined( WIN32 )
# if !defined(UNDER_CE) # define _NO_OLDNAMES 1
# define _NO_OLDNAMES 1 # include <io.h>
# include <io.h>
# endif
# include <winsock2.h> # include <winsock2.h>
# include <ws2tcpip.h> # include <ws2tcpip.h>
# define net_errno (WSAGetLastError()) # define net_errno (WSAGetLastError())
......
...@@ -34,8 +34,7 @@ ...@@ -34,8 +34,7 @@
* *
*/ */
#if defined( UNDER_CE ) #if defined( WIN32 )
#elif defined( WIN32 )
# include <process.h> /* Win32 API */ # include <process.h> /* Win32 API */
#elif defined( __OS2__ ) /* OS/2 API */ #elif defined( __OS2__ ) /* OS/2 API */
...@@ -456,7 +455,7 @@ static inline void vlc_spin_destroy (vlc_spinlock_t *spin) ...@@ -456,7 +455,7 @@ static inline void vlc_spin_destroy (vlc_spinlock_t *spin)
pthread_spin_destroy (spin); pthread_spin_destroy (spin);
} }
#elif defined (WIN32) && !defined (UNDER_CE) #elif defined (WIN32)
typedef CRITICAL_SECTION vlc_spinlock_t; typedef CRITICAL_SECTION vlc_spinlock_t;
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
# include <unistd.h> # include <unistd.h>
# include <fcntl.h> # include <fcntl.h>
#elif defined( WIN32 ) && !defined( UNDER_CE ) #elif defined( WIN32 )
# include <io.h> # include <io.h>
#endif #endif
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <sys/types.h> #include <sys/types.h>
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
# include <unistd.h> # include <unistd.h>
#elif defined( WIN32 ) && !defined( UNDER_CE )