Skip to content

Commit ebd3ef7

Browse files
committed
MSW CMake updates for MediaFoundation-based qtime::
1 parent 099c8a0 commit ebd3ef7

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

proj/cmake/platform_msw.cmake

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ if( NOT CINDER_DISABLE_VIDEO )
5050
if( CINDER_MSW_USE_GSTREAMER )
5151
set( GST_ROOT $ENV{GSTREAMER_1_0_ROOT_X86_64} )
5252
if( GST_ROOT )
53-
list( APPEND CINDER_LIBS_DEPENDS
53+
list( APPEND CINDER_LIBS_DEPENDS
5454
${GST_ROOT}/lib/gstreamer-1.0.lib
5555
${GST_ROOT}/lib/gstapp-1.0.lib
5656
${GST_ROOT}/lib/gstvideo-1.0.lib
@@ -64,22 +64,33 @@ if( NOT CINDER_DISABLE_VIDEO )
6464
${GST_ROOT}/lib/glib-2.0.lib
6565
${GST_ROOT}/lib/gio-2.0.lib )
6666

67-
list( APPEND CINDER_INCLUDE_SYSTEM_PRIVATE
68-
${GST_ROOT}/include
67+
list( APPEND CINDER_INCLUDE_SYSTEM_PRIVATE
68+
${GST_ROOT}/include
6969
${GST_ROOT}/include/gstreamer-1.0
7070
${GST_ROOT}/include/glib-2.0
7171
${GST_ROOT}/lib/gstreamer-1.0/include
7272
${GST_ROOT}/lib/glib-2.0/include
7373
${CINDER_INC_DIR}/cinder/linux )
7474

75-
list( APPEND CINDER_SRC_FILES
76-
${CINDER_SRC_DIR}/cinder/linux/GstPlayer.cpp
75+
list( APPEND CINDER_SRC_FILES
76+
${CINDER_SRC_DIR}/cinder/linux/GstPlayer.cpp
7777
${CINDER_SRC_DIR}/cinder/linux/Movie.cpp )
7878

7979
list( APPEND CINDER_DEFINES CINDER_MSW_USE_GSTREAMER )
8080
else()
8181
message( WARNING "Requested GStreamer video playback support for MSW but no suitable GStreamer installation found. Make sure that GStreamer is installed properly and GSTREAMER_1_0_ROOT_X86_64 is defined in your env variables. " )
8282
endif()
83+
else()
84+
# Default: Use MediaFoundation for video playback on Windows
85+
list( APPEND SRC_SET_VIDEO_MSW
86+
${CINDER_SRC_DIR}/cinder/qtime/QuickTimeImplMsw.cpp
87+
${CINDER_SRC_DIR}/cinder/qtime/QuickTimeGlImplMsw.cpp
88+
${CINDER_SRC_DIR}/cinder/qtime/mf/MediaEnginePlayer.cpp
89+
${CINDER_SRC_DIR}/cinder/qtime/mf/DXGIRenderPath.cpp
90+
${CINDER_SRC_DIR}/cinder/qtime/mf/WICRenderPath.cpp
91+
)
92+
93+
list( APPEND CINDER_SRC_FILES ${SRC_SET_VIDEO_MSW} )
8394
endif()
8495
endif()
8596

0 commit comments

Comments
 (0)