Skip to content

Commit 685b1fd

Browse files
committed
Enable and fix gdk module with MSVC
1 parent 0299e05 commit 685b1fd

File tree

4 files changed

+18
-3
lines changed

4 files changed

+18
-3
lines changed

CMakePresets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"MOD_AVFORMAT": "ON",
1414
"MOD_DECKLINK": "OFF",
1515
"MOD_FREI0R": "OFF",
16-
"MOD_GDK": "OFF",
16+
"MOD_GDK": "ON",
1717
"MOD_JACKRACK": "OFF",
1818
"USE_LV2": "OFF",
1919
"USE_VST2": "OFF",

src/modules/gdk/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ target_compile_options(mltgdk PRIVATE ${MLT_COMPILE_OPTIONS})
1616
target_include_directories(mltgdk PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
1717

1818
target_link_libraries(mltgdk PRIVATE mlt Threads::Threads PkgConfig::GdkPixbuf)
19-
if(NOT MSVC)
19+
if(MSVC)
20+
target_link_libraries(mltgdk PRIVATE PThreads4W::PThreads4W)
21+
else()
2022
target_link_libraries(mltgdk PRIVATE m)
2123
endif()
2224

src/modules/gdk/producer_pixbuf.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,19 @@
3737
#include <string.h>
3838
#include <sys/stat.h>
3939
#include <sys/types.h>
40+
41+
#ifndef _MSC_VER
4042
#include <unistd.h>
43+
#endif
44+
45+
#ifndef ssize_t
46+
#ifdef _WIN32
47+
#include <BaseTsd.h>
48+
#define ssize_t SSIZE_T
49+
#else
50+
#define ssize_t ptrdiff_t
51+
#endif
52+
#endif
4153

4254
// this protects concurrent access to gdk_pixbuf
4355
static pthread_mutex_t g_mutex = PTHREAD_MUTEX_INITIALIZER;

vcpkg.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"qtbase",
1313
"qtsvg",
1414
"libxml2",
15-
"libebur128"
15+
"libebur128",
16+
"gdk-pixbuf"
1617
]
1718
}

0 commit comments

Comments
 (0)