From 75cda958d3866c6eb6a0da4e31c3d2d0b7d15e6a Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Fri, 2 Aug 2013 10:03:41 -0500 Subject: [PATCH] Fixing Qt build instructions... so it works on Windows and Linux. --- src/CMakeLists.txt | 7 ++++--- src/Main.cpp | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a231903c..f1cdb616 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -31,9 +31,10 @@ include_directories(${SDL_INCLUDE_DIR}) # Find QT4 libraries FIND_PACKAGE(Qt4 REQUIRED) -# Include SDL headers (needed for compile) -INCLUDE(${QT_USE_FILE}) -ADD_DEFINITIONS(${QT_DEFINITIONS}) +# Include Qt headers (needed for compile) +include(${QT_USE_FILE}) +include_directories(${QT_INCLUDES}) +add_definitions(${QT_DEFINITIONS}) ################# BLACKMAGIC DECKLINK ################### diff --git a/src/Main.cpp b/src/Main.cpp index 0f3e82bb..7893005f 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -7,7 +7,7 @@ #include "../include/OpenShot.h" #include "../include/Json.h" #include -#include +#include using namespace openshot; using namespace tr1;