Linux update

kibsoft · Jun 26, 2013 · 1f4ece6 · 1f4ece6
1 parent e56ffbc
commit 1f4ece6
Show file tree

Hide file tree

Showing 31 changed files with 158 additions and 19 deletions.
diff --git a/examples/CameraExample/CameraExample.pro b/examples/CameraExample/CameraExample.pro
@@ -15,9 +15,13 @@ TEMPLATE = app
 INCLUDEPATH += ../../include
 
 greaterThan(QT_MAJOR_VERSION, 4) {
-LIBS += -L../../libsQt5
+    LIBS += -L../../libsQt5
 } else {
-LIBS += -L../../libsQt4
+    LIBS += -L../../libsQt4
+}
+
+unix {
+    DEFINES += QTMEL_NOT_INSTALLED
 }
 
 CONFIG(debug, debug|release) {

diff --git a/examples/EncoderExample/EncoderExample.pro b/examples/EncoderExample/EncoderExample.pro
@@ -15,13 +15,14 @@ TEMPLATE = app
 INCLUDEPATH += ../../include
 
 greaterThan(QT_MAJOR_VERSION, 4) {
-LIBS += -L../../libsQt5
+    LIBS += -L../../libsQt5
 } else {
-LIBS += -L../../libsQt4
+    LIBS += -L../../libsQt4
 }
 
 
 unix {
+    DEFINES += QTMEL_NOT_INSTALLED
     LIBS += -lpthread -lX11
     QMAKE_CXXFLAGS += -std=c++0x
 }

diff --git a/include/AbstractGrabber b/include/AbstractGrabber
@@ -1 +1,12 @@
-#include "../src/grabbers/abstractgrabber.h"
+#if QT_VERSION >= 0x050000
+#define CONDITION defined(Q_OS_WIN) || (defined(Q_OS_LINUX) && defined(QTMEL_NOT_INSTALLED))
+#else
+#define CONDITION defined(Q_WS_WIN) || (defined(Q_WS_X11) && defined(QTMEL_NOT_INSTALLED))
+#endif
+
+#if CONDITION
+#include "../src/grabbers/abstractgrabber.h"
+#else
+#include "./src/grabbers/abstractgrabber.h"
+#endif
+
diff --git a/include/AbstractImageGrabber b/include/AbstractImageGrabber
@@ -1 +1,13 @@
-#include "../src/grabbers/image/abstractimagegrabber.h"
+#if QT_VERSION >= 0x050000
+#define CONDITION defined(Q_OS_WIN) || (defined(Q_OS_LINUX) && defined(QTMEL_NOT_INSTALLED))
+#else
+#define CONDITION defined(Q_WS_WIN) || (defined(Q_WS_X11) && defined(QTMEL_NOT_INSTALLED))
+#endif
+
+#if CONDITION
+#include "../src/grabbers/image/abstractimagegrabber.h"
+#else
+#include "./src/grabbers/image/abstractimagegrabber.h"
+#endif
+
+
diff --git a/include/AudioCodecSettings b/include/AudioCodecSettings
@@ -1 +1,11 @@
-#include "../src/encoder/audiocodecsettings.h"
+#if QT_VERSION >= 0x050000
+#define CONDITION defined(Q_OS_WIN) || (defined(Q_OS_LINUX) && defined(QTMEL_NOT_INSTALLED))
+#else
+#define CONDITION defined(Q_WS_WIN) || (defined(Q_WS_X11) && defined(QTMEL_NOT_INSTALLED))
+#endif
+
+#if CONDITION
+#include "../src/encoder/audiocodecsettings.h"
+#else
+#include "./src/encoder/audiocodecsettings.h"
+#endif
diff --git a/include/AudioGrabber b/include/AudioGrabber
@@ -1 +1,11 @@
-#include "../src/grabbers/audio/audiograbber.h"
+#if QT_VERSION >= 0x050000
+#define CONDITION defined(Q_OS_WIN) || (defined(Q_OS_LINUX) && defined(QTMEL_NOT_INSTALLED))
+#else
+#define CONDITION defined(Q_WS_WIN) || (defined(Q_WS_X11) && defined(QTMEL_NOT_INSTALLED))
+#endif
+
+#if CONDITION
+#include "../src/grabbers/audio/audiograbber.h"
+#else
+#include "./src/grabbers/audio/audiograbber.h"
+#endif
diff --git a/include/CameraGrabber b/include/CameraGrabber
@@ -1 +1,11 @@
-#include "../src/grabbers/image/cameragrabber.h"
+#if QT_VERSION >= 0x050000
+#define CONDITION defined(Q_OS_WIN) || (defined(Q_OS_LINUX) && defined(QTMEL_NOT_INSTALLED))
+#else
+#define CONDITION defined(Q_WS_WIN) || (defined(Q_WS_X11) && defined(QTMEL_NOT_INSTALLED))
+#endif
+
+#if CONDITION
+#include "../src/grabbers/image/cameragrabber.h"
+#else
+#include "./src/grabbers/image/cameragrabber.h"
+#endif
diff --git a/include/Encoder b/include/Encoder
@@ -1 +1,11 @@
-#include "../src/encoder/encoder.h"
+#if QT_VERSION >= 0x050000
+#define CONDITION defined(Q_OS_WIN) || (defined(Q_OS_LINUX) && defined(QTMEL_NOT_INSTALLED))
+#else
+#define CONDITION defined(Q_WS_WIN) || (defined(Q_WS_X11) && defined(QTMEL_NOT_INSTALLED))
+#endif
+
+#if CONDITION
+#include "../src/encoder/encoder.h"
+#else
+#include "./src/encoder/encoder.h"
+#endif
diff --git a/include/EncoderGlobal b/include/EncoderGlobal
@@ -1 +1,11 @@
-#include "../src/encoder/encoderglobal.h"
+#if QT_VERSION >= 0x050000
+#define CONDITION defined(Q_OS_WIN) || (defined(Q_OS_LINUX) && defined(QTMEL_NOT_INSTALLED))
+#else
+#define CONDITION defined(Q_WS_WIN) || (defined(Q_WS_X11) && defined(QTMEL_NOT_INSTALLED))
+#endif
+
+#if CONDITION
+#include "../src/encoder/encoderglobal.h"
+#else
+#include "./src/encoder/encoderglobal.h"
+#endif
diff --git a/include/Recorder b/include/Recorder
@@ -1 +1,11 @@
-#include "../src/helpers/recorder.h"
+#if QT_VERSION >= 0x050000
+#define CONDITION defined(Q_OS_WIN) || (defined(Q_OS_LINUX) && defined(QTMEL_NOT_INSTALLED))
+#else
+#define CONDITION defined(Q_WS_WIN) || (defined(Q_WS_X11) && defined(QTMEL_NOT_INSTALLED))
+#endif
+
+#if CONDITION
+#include "../src/helpers/recorder.h"
+#else
+#include "./src/helpers/recorder.h"
+#endif
diff --git a/include/ScreenGrabber b/include/ScreenGrabber
@@ -1 +1,11 @@
-#include "../src/grabbers/image/screengrabber.h"
+#if QT_VERSION >= 0x050000
+#define CONDITION defined(Q_OS_WIN) || (defined(Q_OS_LINUX) && defined(QTMEL_NOT_INSTALLED))
+#else
+#define CONDITION defined(Q_WS_WIN) || (defined(Q_WS_X11) && defined(QTMEL_NOT_INSTALLED))
+#endif
+
+#if CONDITION
+#include "../src/grabbers/image/screengrabber.h"
+#else
+#include "./src/grabbers/image/screengrabber.h"
+#endif
diff --git a/include/VideoCodecSettings b/include/VideoCodecSettings
@@ -1 +1,11 @@
-#include "../src/encoder/videocodecsettings.h"
+#if QT_VERSION >= 0x050000
+#define CONDITION defined(Q_OS_WIN) || (defined(Q_OS_LINUX) && defined(QTMEL_NOT_INSTALLED))
+#else
+#define CONDITION defined(Q_WS_WIN) || (defined(Q_WS_X11) && defined(QTMEL_NOT_INSTALLED))
+#endif
+
+#if CONDITION
+#include "../src/encoder/videocodecsettings.h"
+#else
+#include "./src/encoder/videocodecsettings.h"
+#endif
diff --git a/qtmel.pro b/qtmel.pro
@@ -32,7 +32,7 @@ CONFIG(debug, debug|release) {
     TARGET = qtmel
 }
 
-INCLUDEPATH += $$(FFMPEG_INCLUDE_PATH) $$(OPENCV_INCLUDE_PATH) ./include/rtaudio/
+INCLUDEPATH += $$(FFMPEG_INCLUDE_PATH) $$(OPENCV_INCLUDE_PATH) ./src/3rdparty/RtAudio/include
 LIBS += -L$$(FFMPEG_LIBRARY_PATH) -L$$(OPENCV_LIBRARY_PATH)
 
 win32 {
@@ -60,6 +60,37 @@ unix {
     -lavutil \
     -lopencv_highgui \
     -lasound
+
+    #make install
+    headers1.files = ./src/grabbers/image/*.h
+    headers1.path = /usr/local/include/src/grabbers/image
+
+    headers2.files = ./src/grabbers/audio/*.h
+    headers2.path = /usr/local/include/src/grabbers/audio
+
+    headers3.files = ./src/grabbers/*.h
+    headers3.path = /usr/local/include/src/grabbers
+
+    headers4.files = ./src/encoder/*.h
+    headers4.path = /usr/local/include/src/encoder
+
+    headers5.files = ./src/helpers/*.h
+    headers5.path = /usr/local/include/src/helpers
+
+    headers6.files = ./src/*.h
+    headers6.path = /usr/local/include/src
+
+    headers7.files = ./include/*
+    headers7.path = /usr/local/include
+
+    greaterThan(QT_MAJOR_VERSION, 4) {
+        libs.files = ./libsQt5/*
+    } else {
+        libs.files = ./libsQt4/*
+    }
+    libs.path = /usr/local/lib
+
+    INSTALLS += headers1 headers2 headers3 headers4 headers5 headers6 headers7 libs
 }
 
 SOURCES += src/grabbers/abstractgrabber.cpp \
@@ -71,7 +102,7 @@ SOURCES += src/grabbers/abstractgrabber.cpp \
     src/grabbers/audio/audiograbber.cpp \
     src/encoder/audiocodecsettings.cpp \
     src/grabbers/image/cameragrabber.cpp \
-    src/3rdparty/RtAudio.cpp \
+    src/3rdparty/RtAudio/RtAudio.cpp \
     src/helpers/recorder.cpp \
     src/helpers/audiotimer.cpp
 
@@ -87,7 +118,7 @@ HEADERS += src/grabbers/abstractgrabber.h\
     src/grabbers/audio/audiograbber.h \
     src/encoder/audiocodecsettings.h \
     src/grabbers/image/cameragrabber.h \
-    src/3rdparty/RtError.h \
-    src/3rdparty/RtAudio.h \
+    src/3rdparty/RtAudio/RtError.h \
+    src/3rdparty/RtAudio/RtAudio.h \
     src/helpers/recorder.h \
     src/helpers/audiotimer.h
diff --git a/src/3rdparty/RtAudio.cpp → src/3rdparty/RtAudio/RtAudio.cpp b/src/3rdparty/RtAudio.cpp → src/3rdparty/RtAudio/RtAudio.cpp
diff --git a/src/3rdparty/RtAudio.h → src/3rdparty/RtAudio/RtAudio.h b/src/3rdparty/RtAudio.h → src/3rdparty/RtAudio/RtAudio.h
diff --git a/src/3rdparty/RtError.h → src/3rdparty/RtAudio/RtError.h b/src/3rdparty/RtError.h → src/3rdparty/RtAudio/RtError.h
diff --git a/include/rtaudio/asio.cpp → src/3rdparty/RtAudio/include/asio.cpp b/include/rtaudio/asio.cpp → src/3rdparty/RtAudio/include/asio.cpp
diff --git a/include/rtaudio/asio.h → src/3rdparty/RtAudio/include/asio.h b/include/rtaudio/asio.h → src/3rdparty/RtAudio/include/asio.h
diff --git a/include/rtaudio/asiodrivers.cpp → src/3rdparty/RtAudio/include/asiodrivers.cpp b/include/rtaudio/asiodrivers.cpp → src/3rdparty/RtAudio/include/asiodrivers.cpp
diff --git a/include/rtaudio/asiodrivers.h → src/3rdparty/RtAudio/include/asiodrivers.h b/include/rtaudio/asiodrivers.h → src/3rdparty/RtAudio/include/asiodrivers.h
diff --git a/include/rtaudio/asiodrvr.h → src/3rdparty/RtAudio/include/asiodrvr.h b/include/rtaudio/asiodrvr.h → src/3rdparty/RtAudio/include/asiodrvr.h
diff --git a/include/rtaudio/asiolist.cpp → src/3rdparty/RtAudio/include/asiolist.cpp b/include/rtaudio/asiolist.cpp → src/3rdparty/RtAudio/include/asiolist.cpp
diff --git a/include/rtaudio/asiolist.h → src/3rdparty/RtAudio/include/asiolist.h b/include/rtaudio/asiolist.h → src/3rdparty/RtAudio/include/asiolist.h
diff --git a/include/rtaudio/asiosys.h → src/3rdparty/RtAudio/include/asiosys.h b/include/rtaudio/asiosys.h → src/3rdparty/RtAudio/include/asiosys.h
diff --git a/include/rtaudio/dsound.h → src/3rdparty/RtAudio/include/dsound.h b/include/rtaudio/dsound.h → src/3rdparty/RtAudio/include/dsound.h
diff --git a/include/rtaudio/ginclude.h → src/3rdparty/RtAudio/include/ginclude.h b/include/rtaudio/ginclude.h → src/3rdparty/RtAudio/include/ginclude.h
diff --git a/include/rtaudio/iasiodrv.h → src/3rdparty/RtAudio/include/iasiodrv.h b/include/rtaudio/iasiodrv.h → src/3rdparty/RtAudio/include/iasiodrv.h
diff --git a/include/rtaudio/iasiothiscallresolver.cpp → ...RtAudio/include/iasiothiscallresolver.cpp b/include/rtaudio/iasiothiscallresolver.cpp → ...RtAudio/include/iasiothiscallresolver.cpp
diff --git a/include/rtaudio/iasiothiscallresolver.h → ...y/RtAudio/include/iasiothiscallresolver.h b/include/rtaudio/iasiothiscallresolver.h → ...y/RtAudio/include/iasiothiscallresolver.h
diff --git a/include/rtaudio/soundcard.h → src/3rdparty/RtAudio/include/soundcard.h b/include/rtaudio/soundcard.h → src/3rdparty/RtAudio/include/soundcard.h
diff --git a/src/grabbers/audio/audiograbber.cpp b/src/grabbers/audio/audiograbber.cpp
@@ -21,7 +21,7 @@
 ****************************************************************************/
 
 #include "audiograbber.h"
-#include "../../3rdparty/RtAudio.h"
+#include "../../3rdparty/RtAudio/RtAudio.h"
 
 int handleData(void *outputBuffer, void *inputBuffer, unsigned int nBufferFrames,
                double streamTime, RtAudioStreamStatus status, void *data)