Skip to content

Commit 8c9d29a

Browse files
committed
MSW CMake ignoring GL qtime on ANGLE
1 parent 59e9c3e commit 8c9d29a

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

proj/cmake/platform_msw.cmake

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,18 @@ if( NOT CINDER_DISABLE_VIDEO )
9393
# Default: Use MediaFoundation for video playback on Windows
9494
list( APPEND SRC_SET_VIDEO_MSW
9595
${CINDER_SRC_DIR}/cinder/qtime/QuickTimeImplMsw.cpp
96-
${CINDER_SRC_DIR}/cinder/qtime/QuickTimeGlImplMsw.cpp
9796
${CINDER_SRC_DIR}/cinder/qtime/mf/MediaEnginePlayer.cpp
98-
${CINDER_SRC_DIR}/cinder/qtime/mf/DXGIRenderPath.cpp
9997
${CINDER_SRC_DIR}/cinder/qtime/mf/WICRenderPath.cpp
10098
)
10199

100+
# MovieGl and DXGIRenderPath use WGL_NV_DX_interop which requires native OpenGL
101+
if( NOT CINDER_GL_ANGLE )
102+
list( APPEND SRC_SET_VIDEO_MSW
103+
${CINDER_SRC_DIR}/cinder/qtime/QuickTimeGlImplMsw.cpp
104+
${CINDER_SRC_DIR}/cinder/qtime/mf/DXGIRenderPath.cpp
105+
)
106+
endif()
107+
102108
list( APPEND CINDER_SRC_FILES ${SRC_SET_VIDEO_MSW} )
103109
endif()
104110
endif()

0 commit comments

Comments
 (0)