File tree Expand file tree Collapse file tree 5 files changed +17
-3
lines changed Expand file tree Collapse file tree 5 files changed +17
-3
lines changed Original file line number Diff line number Diff line change 50
50
- Fix: Resolve compile-time error about implicit declarations (#1646)
51
51
- Fix: fatal out of memory error extracting from a VOB PS
52
52
- Fix: Unit Test Rust failing due to changes in Rust Version 1.86.0
53
+ - Fix: Support for MINGW-w64 cross compiling
53
54
- Fix: Build with ENABLE_FFMPEG to support ffmpeg 5
54
55
55
56
0.94 (2021-12-14)
Original file line number Diff line number Diff line change @@ -119,7 +119,9 @@ set(FREETYPE_SOURCE
119
119
)
120
120
#Windows specific libraries and linker flags
121
121
if (WIN32 )
122
- include_directories ("${PROJECT_SOURCE_DIR} /thirdparty/win_spec_incld/" )
122
+ if (NOT MINGW)
123
+ include_directories ("${PROJECT_SOURCE_DIR} /thirdparty/win_spec_incld/" )
124
+ endif ()
123
125
include_directories ("${PROJECT_SOURCE_DIR} /thirdparty/win_iconv/" )
124
126
aux_source_directory ("${PROJECT_SOURCE_DIR} /thirdparty/win_iconv/" SOURCEFILE)
125
127
set (EXTRA_LIBS ${EXTRA_LIBS} ws2_32 winmm Bcrypt)
Original file line number Diff line number Diff line change 26
26
#undef UINT64_MAX
27
27
#define UINT64_MAX _UI64_MAX
28
28
typedef int socklen_t ;
29
- typedef int ssize_t ;
29
+ #if !defined(__MINGW64__ ) && !defined(__MINGW32__ )
30
+ typedef int ssize_t ;
31
+ #endif
30
32
typedef uint32_t in_addr_t ;
31
33
#ifndef IN_CLASSD
32
34
#define IN_CLASSD (i ) (((INT32)(i) & 0xf0000000) == 0xe0000000)
118
120
typedef uint8_t UBYTE ;
119
121
120
122
#endif // CCX_PLATFORM_H
123
+
Original file line number Diff line number Diff line change 2
2
#define _CC_ENCODER_COMMON_H
3
3
4
4
#ifdef WIN32
5
- #include "..\\thirdparty\\win_iconv\\iconv.h"
5
+ #if defined(__MINGW64__ ) || defined(__MINGW32__ )
6
+ #include <iconv.h>
7
+ #else
8
+ #include "..\\thirdparty\\win_iconv\\iconv.h"
9
+ #endif
6
10
#else
7
11
#include "iconv.h"
8
12
#endif
Original file line number Diff line number Diff line change 4
4
#include "utility.h"
5
5
#include <stdbool.h>
6
6
#ifdef WIN32
7
+ #if defined(__MINGW64__ ) || defined(__MINGW32__ )
8
+ #include <iconv.h>
9
+ #else
7
10
#include "..\\thirdparty\\win_iconv\\iconv.h"
11
+ #endif
8
12
#else
9
13
#include "iconv.h"
10
14
#endif
You can’t perform that action at this time.
0 commit comments