diff --git a/OpenBoard.pro b/OpenBoard.pro index a5111164..c442a008 100644 --- a/OpenBoard.pro +++ b/OpenBoard.pro @@ -109,12 +109,20 @@ RCC_DIR = $$BUILD_DIR/rcc UI_DIR = $$BUILD_DIR/ui win32 { + + + LIBS += -lUser32 + LIBS += -lGdi32 + LIBS += -lAdvApi32 + LIBS += -lOle32 + RC_FILE = resources/win/OpenBoard.rc - CONFIG += qaxcontainer + CONFIG += axcontainer exists(console):CONFIG += console QMAKE_CXXFLAGS += /MP + QMAKE_CXXFLAGS += /MD QMAKE_CXXFLAGS_RELEASE += /Od /Zi - QMAKE_LFLAGS_RELEASE += /DEBUG + QMAKE_LFLAGS += /VERBOSE:LIB UB_LIBRARY.path = $$DESTDIR UB_I18N.path = $$DESTDIR/i18n UB_ETC.path = $$DESTDIR @@ -126,6 +134,7 @@ win32 { DEFINES += NOMINMAX # avoids compilation error in qdatetime.h + } macx { diff --git a/src/podcast/UBPodcastController.cpp b/src/podcast/UBPodcastController.cpp index 98a5c79f..7dbb3644 100644 --- a/src/podcast/UBPodcastController.cpp +++ b/src/podcast/UBPodcastController.cpp @@ -57,8 +57,8 @@ #ifdef Q_OS_WIN - // #include "windowsmedia/UBWindowsMediaVideoEncoder.h" - // #include "windowsmedia/UBWaveRecorder.h" + #include "windowsmedia/UBWindowsMediaVideoEncoder.h" + #include "windowsmedia/UBWaveRecorder.h" #elif defined(Q_OS_OSX) #include "quicktime/UBQuickTimeVideoEncoder.h" #include "quicktime/UBAudioQueueRecorder.h" @@ -304,7 +304,7 @@ void UBPodcastController::start() applicationMainModeChanged(UBApplication::applicationController->displayMode()); #ifdef Q_OS_WIN - //mVideoEncoder = new UBWindowsMediaVideoEncoder(this); //deleted on stop + mVideoEncoder = new UBWindowsMediaVideoEncoder(this); //deleted on stop #elif defined(Q_OS_OSX) mVideoEncoder = new UBQuickTimeVideoEncoder(this); //deleted on stop #endif diff --git a/src/podcast/podcast.pri b/src/podcast/podcast.pri index a9ced647..af441814 100644 --- a/src/podcast/podcast.pri +++ b/src/podcast/podcast.pri @@ -13,13 +13,13 @@ SOURCES += src/podcast/UBPodcastController.cpp \ win32 { -# SOURCES += src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp \ -# src/podcast/windowsmedia/UBWindowsMediaFile.cpp \ -# src/podcast/windowsmedia/UBWaveRecorder.cpp -# -# HEADERS += src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.h \ -# src/podcast/windowsmedia/UBWindowsMediaFile.h \ -# src/podcast/windowsmedia/UBWaveRecorder.h + SOURCES += src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp \ + src/podcast/windowsmedia/UBWindowsMediaFile.cpp \ + src/podcast/windowsmedia/UBWaveRecorder.cpp + + HEADERS += src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.h \ + src/podcast/windowsmedia/UBWindowsMediaFile.h \ + src/podcast/windowsmedia/UBWaveRecorder.h } macx { diff --git a/src/podcast/windowsmedia/UBWindowsMediaFile.h b/src/podcast/windowsmedia/UBWindowsMediaFile.h index 703e027a..0f3d869c 100644 --- a/src/podcast/windowsmedia/UBWindowsMediaFile.h +++ b/src/podcast/windowsmedia/UBWindowsMediaFile.h @@ -30,8 +30,9 @@ #include -#include - +#ifndef inteface +#define interface struct +#endif #include class UBWindowsMediaFile : public QObject diff --git a/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp b/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp index 6645279c..d474cb0f 100644 --- a/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp +++ b/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp @@ -33,7 +33,6 @@ #include "core/UBApplication.h" -#include "UBWindowsMediaFile.h" #include "core/memcheck.h"