fix build problems for maemo

suxinde2009 · Apr 18, 2014 · 6f4bbf7 · 6f4bbf7
1 parent 0f370ef
commit 6f4bbf7
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/src/VideoDecoderCUDA.cpp b/src/VideoDecoderCUDA.cpp
@@ -20,10 +20,10 @@
 ******************************************************************************/
 
 #include <QtAV/VideoDecoder.h>
-#include "private/VideoDecoder_p.h"
+#include "QtAV/private/VideoDecoder_p.h"
 #include <QtAV/QtAV_Compat.h>
 #include <QtAV/BlockingQueue.h>
-#include "prepost.h"
+#include "QtAV/prepost.h"
 #include <QtCore/QQueue>
 #if QTAV_HAVE(DLLAPI_CUDA)
 #include "dllapi.h"

diff --git a/src/cuda/dllapi/nv_inc.h b/src/cuda/dllapi/nv_inc.h
@@ -33,8 +33,8 @@ namespace cuda {
 //extern "C" {
 #endif /* __cplusplus */
 
-#include <cuda.h>
-#include <nvcuvid.h>
+#include "cuda.h"
+#include "nvcuvid.h"
 
 #if defined(__cplusplus)
 //}

diff --git a/src/libQtAV.pri b/src/libQtAV.pri
@@ -151,6 +151,8 @@ unix {
     }
 }
 
+*maemo*: QMAKE_LFLAGS += -lasound
+
 unset(LIB_VERSION)
 unset(PROJECT_SRCPATH)
 unset(PROJECT_LIBDIR)

diff --git a/tests/decoder/decoder.pro b/tests/decoder/decoder.pro
@@ -1,9 +1,6 @@
-QT       += core
-QT       -= gui
-
-CONFIG   += console
-CONFIG   -= app_bundle
-
+QT += opengl
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+CONFIG -= app_bundle
 TEMPLATE = app
 TARGET = decoder
 

diff --git a/tests/decoder/main.cpp b/tests/decoder/main.cpp
@@ -1,5 +1,6 @@
 #include <QCoreApplication>
 #include <QtCore/QElapsedTimer>
+#include <QtCore/QStringList>
 #include <QtAV/AVDemuxer.h>
 #include <QtAV/VideoDecoder.h>
 #include <QtAV/Packet.h>

diff --git a/tests/tests.pro b/tests/tests.pro
@@ -1,5 +1,6 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
+    decoder \
     qiodevice \
     playerthread