Commit f87ad3a0 authored by James Almer's avatar James Almer

Merge commit 'e41daa62'

* commit 'e41daa62':
  Remove support for building for mingw32ce (Windows CE)
Merged-by: 's avatarJames Almer <jamrial@gmail.com>
parents 7e76e1ea e41daa62
......@@ -5033,16 +5033,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
LIBTARGET=i386
if enabled x86_64; then
LIBTARGET="i386:x86-64"
elif enabled arm; then
LIBTARGET=arm-wince
fi
enabled shared && ! enabled small && check_cmd $windres --version && enable gnu_windres
enabled x86_32 && check_ldflags -Wl,--large-address-aware
......
......@@ -40,7 +40,7 @@
#endif
#endif
#if defined(_WIN32) && !defined(__MINGW32CE__)
#ifdef _WIN32
# include <fcntl.h>
# ifdef lseek
# undef lseek
......@@ -54,7 +54,7 @@
# undef fstat
# endif
# define fstat(f,s) _fstati64((f), (s))
#endif /* defined(_WIN32) && !defined(__MINGW32CE__) */
#endif /* defined(_WIN32) */
#ifdef __ANDROID__
......@@ -139,9 +139,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"
......
......@@ -29,7 +29,7 @@
#include <io.h>
#endif
#if defined(_WIN32) && !defined(__MINGW32CE__)
#ifdef _WIN32
#undef open
#undef lseek
#undef stat
......
......@@ -57,7 +57,7 @@ static int av_log_level = AV_LOG_INFO;
static int flags;
#define NB_LEVELS 8
#if defined(_WIN32) && !defined(__MINGW32CE__) && HAVE_SETCONSOLETEXTATTRIBUTE
#if defined(_WIN32) && HAVE_SETCONSOLETEXTATTRIBUTE
#include <windows.h>
static const uint8_t color[16 + AV_CLASS_CATEGORY_NB] = {
[AV_LOG_PANIC /8] = 12,
......@@ -124,7 +124,7 @@ static int use_color = -1;
static void check_color_terminal(void)
{
#if defined(_WIN32) && !defined(__MINGW32CE__) && HAVE_SETCONSOLETEXTATTRIBUTE
#if defined(_WIN32) && HAVE_SETCONSOLETEXTATTRIBUTE
CONSOLE_SCREEN_BUFFER_INFO con_info;
con = GetStdHandle(STD_ERROR_HANDLE);
use_color = (con != INVALID_HANDLE_VALUE) && !getenv("NO_COLOR") &&
......@@ -159,7 +159,7 @@ static void colored_fputs(int level, int tint, const char *str)
if (level == AV_LOG_INFO/8) local_use_color = 0;
else local_use_color = use_color;
#if defined(_WIN32) && !defined(__MINGW32CE__) && HAVE_SETCONSOLETEXTATTRIBUTE
#if defined(_WIN32) && HAVE_SETCONSOLETEXTATTRIBUTE
if (local_use_color)
SetConsoleTextAttribute(con, background | color[level]);
fputs(str, stderr);
......
......@@ -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"
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment