openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Updated build scripts to work with Qt5 on Mac, and also successfully tested on Ubuntu 13.10.

Browse Source
This commit is contained in:
Jonathan Thomas
2013-11-25 00:48:49 -06:00
parent 4f8d27a147
commit 781e70fe03
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/ChunkReader.h
View File

@@ -36,7 +36,7 @@
#include <iostream>
#include <fstream>
#include <omp.h>
#include <qt5/QtCore/qdir.h>
#include <QtCore/qdir.h>
#include <stdio.h>
#include <stdlib.h>
#include <tr1/memory>

2
include/ChunkWriter.h
View File

@@ -37,7 +37,7 @@
#include <iostream>
#include <fstream>
#include <omp.h>
#include <qt5/QtCore/qdir.h>
#include <QtCore/qdir.h>
#include <stdio.h>
#include <sstream>
#include <unistd.h>

6
include/OpenShot.h
View File

@@ -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"

1
src/CMakeLists.txt
View File

@@ -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)