diff --git a/toonz/sources/toonz/CMakeLists.txt b/toonz/sources/toonz/CMakeLists.txt index 6bda998..41ff9b3 100644 --- a/toonz/sources/toonz/CMakeLists.txt +++ b/toonz/sources/toonz/CMakeLists.txt @@ -374,14 +374,11 @@ if(WIN32) endif() endif() -if(WIN32) - # DirectShow strmiids library for Camera Capture - find_library(DSHOW_STRMIIDS_LIB strmiids) - +if(WIN32) target_link_libraries(OpenToonz_${VERSION} Qt5::WinMain Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia - ${GL_LIB} ${GLUT_LIB} ${DSHOW_STRMIIDS_LIB} + ${GL_LIB} ${GLUT_LIB} strmiids tnzcore tnzbase toonzlib colorfx tnzext image sound toonzqt tnztools tnzstdfx tfarm ) elseif(APPLE) diff --git a/toonz/sources/toonz/penciltestpopup.cpp b/toonz/sources/toonz/penciltestpopup.cpp index 9ed9cdb..02fb1b2 100644 --- a/toonz/sources/toonz/penciltestpopup.cpp +++ b/toonz/sources/toonz/penciltestpopup.cpp @@ -1521,7 +1521,9 @@ void PencilTestPopup::onCaptureFilterSettingsBtnPressed() { QList cameras = QCameraInfo::availableCameras(); for (int c = 0; c < cameras.size(); c++) { if (cameras.at(c).deviceName() == m_deviceName) { +#ifdef _WIN32 openCaptureFilterSettings(this, cameras.at(c).description()); +#endif return; } }