diff --git a/cmake/Install.cmake b/cmake/Install.cmake index c5a1c51..287eba9 100644 --- a/cmake/Install.cmake +++ b/cmake/Install.cmake @@ -9,11 +9,11 @@ INSTALL(FILES resources/x-raw.xml DESTINATION share/mime/video ) IF( WIN32 ) IF( NOT USE_QT4 ) - INSTALL(FILES ${QT_DIR}/bin/QT5Core.dll DESTINATION bin ) - INSTALL(FILES ${QT_DIR}/bin/Qt5Gui.dll DESTINATION bin ) - INSTALL(FILES ${QT_DIR}/bin/Qt5Widgets.dll DESTINATION bin ) - INSTALL(FILES ${QT_DIR}/bin/libGLESv2.dll DESTINATION bin ) - INSTALL(FILES ${QT_DIR}/bin/libEGL.dll DESTINATION bin ) + INSTALL(FILES ${QT_DIR}/bin/QT5Core${QT_DLL_POSTFIX}.dll DESTINATION bin ) + INSTALL(FILES ${QT_DIR}/bin/Qt5Gui${QT_DLL_POSTFIX}.dll DESTINATION bin ) + INSTALL(FILES ${QT_DIR}/bin/Qt5Widgets${QT_DLL_POSTFIX}.dll DESTINATION bin ) + INSTALL(FILES ${QT_DIR}/bin/libGLESv2${QT_DLL_POSTFIX}.dll DESTINATION bin ) + INSTALL(FILES ${QT_DIR}/bin/libEGL${QT_DLL_POSTFIX}.dll DESTINATION bin ) INSTALL(FILES ${QT_DIR}/bin/icudt52.dll DESTINATION bin ) INSTALL(FILES ${QT_DIR}/bin/icuin52.dll DESTINATION bin ) INSTALL(FILES ${QT_DIR}/bin/icuuc52.dll DESTINATION bin ) diff --git a/cmake/LibQT.cmake b/cmake/LibQT.cmake index 565a48d..7698bc8 100644 --- a/cmake/LibQT.cmake +++ b/cmake/LibQT.cmake @@ -4,7 +4,8 @@ IF( WIN32 ) SET(QT_DIR "QT-Dir" CACHE PATH "Where to find QT Lib on Windows") - SET (CMAKE_PREFIX_PATH ${QT_DIR} ) + SET(QT_DLL_POSTFIX "" CACHE STRING "Postfix to dll's name for debug" ) + SET(CMAKE_PREFIX_PATH ${QT_DIR} ) ENDIF() IF( USE_QT4 ) diff --git a/source/lib/PlaYUVerStream.cpp b/source/lib/PlaYUVerStream.cpp index 5d3f2df..87fa16a 100644 --- a/source/lib/PlaYUVerStream.cpp +++ b/source/lib/PlaYUVerStream.cpp @@ -22,8 +22,6 @@ * \brief Input stream handling */ -#include "config.h" - #include #include "PlaYUVerStream.h" #ifdef USE_FFMPEG