From 781e70fe030c93dcf65d68fa067cf47544701fcb Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Mon, 25 Nov 2013 00:48:49 -0600 Subject: [PATCH] Updated build scripts to work with Qt5 on Mac, and also successfully tested on Ubuntu 13.10. --- include/ChunkReader.h | 2 +- include/ChunkWriter.h | 2 +- include/OpenShot.h | 6 +++--- src/CMakeLists.txt | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/ChunkReader.h b/include/ChunkReader.h index 32179f4d..55002b11 100644 --- a/include/ChunkReader.h +++ b/include/ChunkReader.h @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/ChunkWriter.h b/include/ChunkWriter.h index d70cf186..349d7cc8 100644 --- a/include/ChunkWriter.h +++ b/include/ChunkWriter.h @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/OpenShot.h b/include/OpenShot.h index 60d56ddf..08a4c0a2 100644 --- a/include/OpenShot.h +++ b/include/OpenShot.h @@ -124,9 +124,9 @@ #include "Timeline.h" /* Qt Video Player */ -#include "Qt/videoplayer.h" -#include "Qt/videowidget.h" -#include "Qt/videowidgetsurface.h" +//#include "Qt/videoplayer.h" +//#include "Qt/videowidget.h" +//#include "Qt/videowidgetsurface.h" /* Effects */ #include "effects/ChromaKey.h" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 993ff4cb..d52e33c7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -56,6 +56,7 @@ include_directories(${SDL_INCLUDE_DIR}) ################# QT5 ################### set(CMAKE_AUTOMOC ON) +#set (CMAKE_PREFIX_PATH "/usr/local/Cellar/qt5/5.1.1/") # Find QT5 libraries find_package(Qt5Widgets)