Browse Source

Remove support for building for mingw32ce (Windows CE)

The toolchain for this target is unmaintained since many years.

While it has been continuously build tested on fate, it hasn't
actually been tested at runtime since many, many years (and back
then, only a few codecs in libavcodec were tested).

So far, keeping support for it has been mostly effortless, but
the compiler does seem to have issues with dllimported data symbols,
ending up as internal compiler errors in some cases. Instead of
jumping through further hoops to work around that, just remove the
target.

Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö 7 years ago
parent
commit
e41daa6246
5 changed files with 7 additions and 18 deletions
  1. 1 7
      configure
  2. 3 5
      libavformat/os_support.h
  3. 1 1
      libavutil/file_open.c
  4. 1 1
      libavutil/wchar_filename.h
  5. 1 4
      tools/qt-faststart.c

+ 1 - 7
configure

@@ -4021,16 +4021,10 @@ case $target_os in
         die "Native MSYS builds are discouraged, please use the MINGW environment."
         ;;
     mingw32*|mingw64*)
-        if test $target_os = "mingw32ce"; then
-            disable network
-        else
-            target_os=mingw32
-        fi
+        target_os=mingw32
         LIBTARGET=i386
         if enabled x86_64; then
             LIBTARGET="i386:x86-64"
-        elif enabled arm; then
-            LIBTARGET=arm-wince
         fi
         check_ldflags -Wl,--nxcompat
         check_ldflags -Wl,--dynamicbase

+ 3 - 5
libavformat/os_support.h

@@ -40,7 +40,7 @@
 #endif
 #endif
 
-#if defined(_WIN32) && !defined(__MINGW32CE__)
+#ifdef _WIN32
 #  include <fcntl.h>
 #  undef lseek
 #  define lseek(f,p,w) _lseeki64((f), (p), (w))
@@ -48,7 +48,7 @@
 #  define stat _stati64
 #  undef fstat
 #  define fstat(f,s) _fstati64((f), (s))
-#endif /* defined(_WIN32) && !defined(__MINGW32CE__) */
+#endif /* defined(_WIN32) */
 
 static inline int is_dos_path(const char *path)
 {
@@ -122,9 +122,7 @@ int ff_poll(struct pollfd *fds, nfds_t numfds, int timeout);
 #endif /* HAVE_POLL_H */
 #endif /* CONFIG_NETWORK */
 
-#if defined(__MINGW32CE__)
-#define mkdir(a, b) _mkdir(a)
-#elif defined(_WIN32)
+#ifdef _WIN32
 #include <stdio.h>
 #include <windows.h>
 #include "libavutil/wchar_filename.h"

+ 1 - 1
libavutil/file_open.c

@@ -29,7 +29,7 @@
 #include <io.h>
 #endif
 
-#if defined(_WIN32) && !defined(__MINGW32CE__)
+#ifdef _WIN32
 #undef open
 #undef lseek
 #undef stat

+ 1 - 1
libavutil/wchar_filename.h

@@ -19,7 +19,7 @@
 #ifndef AVUTIL_WCHAR_FILENAME_H
 #define AVUTIL_WCHAR_FILENAME_H
 
-#if defined(_WIN32) && !defined(__MINGW32CE__)
+#ifdef _WIN32
 #include <windows.h>
 #include "mem.h"
 

+ 1 - 4
tools/qt-faststart.c

@@ -29,10 +29,7 @@
 #include <inttypes.h>
 #include <string.h>
 
-#ifdef __MINGW32CE__
-#define fseeko(x, y, z) fseek(x, y, z)
-#define ftello(x)       ftell(x)
-#elif defined(__MINGW32__)
+#ifdef __MINGW32__
 #undef fseeko
 #define fseeko(x, y, z) fseeko64(x, y, z)
 #undef ftello