Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/CHANGES.TXT
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
- Fix: Resolve compile-time error about implicit declarations (#1646)
- Fix: fatal out of memory error extracting from a VOB PS
- Fix: Unit Test Rust failing due to changes in Rust Version 1.86.0
- Fix: Support for MINGW-w64 cross compiling
- Fix: Build with ENABLE_FFMPEG to support ffmpeg 5

0.94 (2021-12-14)
Expand Down
4 changes: 3 additions & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,9 @@ set(FREETYPE_SOURCE
)
#Windows specific libraries and linker flags
if(WIN32)
include_directories ("${PROJECT_SOURCE_DIR}/thirdparty/win_spec_incld/")
if(NOT MINGW)
include_directories ("${PROJECT_SOURCE_DIR}/thirdparty/win_spec_incld/")
endif()
include_directories ("${PROJECT_SOURCE_DIR}/thirdparty/win_iconv/")
aux_source_directory ("${PROJECT_SOURCE_DIR}/thirdparty/win_iconv/" SOURCEFILE)
set (EXTRA_LIBS ${EXTRA_LIBS} ws2_32 winmm Bcrypt)
Expand Down
5 changes: 4 additions & 1 deletion src/lib_ccx/ccx_common_platform.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@
#undef UINT64_MAX
#define UINT64_MAX _UI64_MAX
typedef int socklen_t;
typedef int ssize_t;
#if !defined(__MINGW64__) && !defined(__MINGW32__)
typedef int ssize_t;
#endif
typedef uint32_t in_addr_t;
#ifndef IN_CLASSD
#define IN_CLASSD(i) (((INT32)(i) & 0xf0000000) == 0xe0000000)
Expand Down Expand Up @@ -118,3 +120,4 @@
typedef uint8_t UBYTE;

#endif // CCX_PLATFORM_H

6 changes: 5 additions & 1 deletion src/lib_ccx/ccx_encoders_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
#define _CC_ENCODER_COMMON_H

#ifdef WIN32
#include "..\\thirdparty\\win_iconv\\iconv.h"
#if defined(__MINGW64__) || defined(__MINGW32__)
#include <iconv.h>
#else
#include "..\\thirdparty\\win_iconv\\iconv.h"
#endif
#else
#include "iconv.h"
#endif
Expand Down
4 changes: 4 additions & 0 deletions src/lib_ccx/ts_tables_epg.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
#include "utility.h"
#include <stdbool.h>
#ifdef WIN32
#if defined(__MINGW64__) || defined(__MINGW32__)
#include <iconv.h>
#else
#include "..\\thirdparty\\win_iconv\\iconv.h"
#endif
#else
#include "iconv.h"
#endif
Expand Down
Loading