Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Tidy QJson includes so Qt-style work installed and in src

  • Loading branch information...
commit a5ab063cc8c4553a8a1f1baad32eb47013a799a9 1 parent 9d02591
@Beirdo Beirdo authored
View
5 mythplugins/settings.pro
@@ -3,8 +3,6 @@ CONFIG += $$CCONFIG
LIBVERSION = 0.26
INCLUDEPATH += $${SYSROOT}$${PREFIX}/include
-#INCLUDEPATH += /usr/include/cdda
-#INCLUDEPATH += /usr/include/FLAC
LIBS *= -L$${SYSROOT}$${PREFIX}/$${LIBDIRNAME}
@@ -72,6 +70,9 @@ EXTRA_LIBS += $$LOCAL_LIBDIR_X11
EXTRA_LIBS += $$CONFIG_XV_LIBS
EXTRA_LIBS += $$CONFIG_XVMC_LIBS
EXTRA_LIBS += $$CONFIG_OPENGL_VSYNC_LIBS
+EXTRA_LIBS += -lzmq
+EXTRA_LIBS += -lmythnzmqt
+EXTRA_LIBS += -lmythqjson
LIRC_LIBS = $$CONFIG_LIRC_LIBS
View
8 mythtv/external/Makefile
@@ -19,14 +19,16 @@ distclean: ${SUBDIRS_DISTCLEAN}
FFmpeg-all FFmpeg-install FFmpeg-uninstall FFmpeg-clean FFmpeg-distclean:
${MAKE} -C FFmpeg ${@:FFmpeg-%=%}
-zeromq-all:
- (cd zeromq ; ./configure --prefix=${PREFIX})
+zeromq-all: zeromq/Makefile
${MAKE} -C zeromq all
+zeromq/Makefile: zeromq/configure
+ (cd zeromq ; ./configure --prefix=${PREFIX})
+
zeromq-install zeromq-uninstall zeromq-clean zeromq-distclean:
${MAKE} -C zeromq ${@:zeromq-%=%}
-nzmqt-all:
+nzmqt-all: zeromq-all
(cd nzmqt/src ; ${QMAKE})
${MAKE} -C nzmqt/src all
View
2  mythtv/external/qjson/include/QJson/Parser
@@ -1 +1 @@
-#include "../../src/parser.h"
+#include "../qjson/parser.h"
View
2  mythtv/external/qjson/include/QJson/QObjectHelper
@@ -1 +1 @@
-#include "../../src/qobjecthelper.h"
+#include "../qjson/qobjecthelper.h"
View
2  mythtv/external/qjson/include/QJson/Serializer
@@ -1 +1 @@
-#include "../../src/serializer.h"
+#include "../qjson/serializer.h"
View
1  mythtv/external/qjson/include/qjson
View
5 mythtv/external/qjson/qjson.pro
@@ -1,6 +1,7 @@
TEMPLATE = subdirs
-SUBDIRS = sub_src sub_unittest
+SUBDIRS = sub_src
+#sub_unittest
sub_src.subdir = src
sub_unittest.subdir = tests
-sub_unittest.depends = sub_src
+sub_unittest.depends = sub_src
View
9 mythtv/external/qjson/src/src.pro
@@ -80,3 +80,12 @@ inc.path = $${PREFIX}/include/qjson/
INSTALLS += inc
+PUBLIC_CPPHEADERS += \
+ $$QJSON_BASE/include/QJson/QObjectHelper \
+ $$QJSON_BASE/include/QJson/Serializer \
+ $$QJSON_BASE/include/QJson/Parser
+
+cppinc.files += $${PUBLIC_CPPHEADERS}
+cppinc.path += $${PREFIX}/include/QJson/
+
+INSTALLS += cppinc
View
4 mythtv/libs/libmythbase/libmythbase.pro
@@ -6,8 +6,6 @@ TARGET = mythbase-$$LIBVERSION
CONFIG += thread dll
target.path = $${LIBDIR}
INSTALLS = target
-INCLUDEPATH += $$PREFIX/include
-INCLUDEPATH += $$PREFIX/include/qjson
QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
@@ -125,4 +123,4 @@ QT += xml sql network
include ( ../libs-targetfix.pro )
-LIBS += $$EXTRA_LIBS $$LATE_LIBS -lzmq -lmythqjson
+LIBS += $$EXTRA_LIBS $$LATE_LIBS
View
8 mythtv/libs/libmythbase/logging.cpp
@@ -56,10 +56,12 @@ extern "C" {
#include <mach/mach.h>
#endif
+// nzmqt
#include "nzmqt.hpp"
-#include "qjson/qobjecthelper.h"
-#include "qjson/serializer.h"
-#include "qjson/parser.h"
+// QJson
+#include "QJson/QObjectHelper"
+#include "QJson/Serializer"
+#include "QJson/Parser"
static QMutex logQueueMutex;
static QQueue<LoggingItem *> logQueue;
View
9 mythtv/settings.pro
@@ -84,8 +84,9 @@ contains(CONFIG_DARWIN, yes) {
}
INCLUDEPATH += $$unique(CONFIG_INCLUDEPATH)
-INCLUDEPATH += $$PREFIX/include
-INCLUDEPATH += $$PREFIX/include/qjson
+INCLUDEPATH += $$SRC_PATH_BARE/external/zeromq/include
+INCLUDEPATH += $$SRC_PATH_BARE/external/nzmqt/include/nzmqt
+INCLUDEPATH += $$SRC_PATH_BARE/external/qjson/include
# remove warn_{on|off} from CONFIG since we set it in our CFLAGS
CONFIG -= warn_on warn_off
@@ -158,6 +159,8 @@ EXTRA_LIBS += $$CONFIG_FIREWIRE_LIBS
EXTRA_LIBS += $$LOCAL_LIBDIR_OGL
EXTRA_LIBS += $$LOCAL_LIBDIR_X11
EXTRA_LIBS += $$CONFIG_OPENGL_LIBS
-EXTRA_LIBS += -lzmq -lmythnzmqt -lmythqjson
+EXTRA_LIBS += -L$$SRC_PATH_BARE/external/zeromq/src/.libs -lzmq
+EXTRA_LIBS += -L$$SRC_PATH_BARE/external/nzmqt/src -lmythnzmqt
+EXTRA_LIBS += -L$$SRC_PATH_BARE/external/qjson/lib -lmythqjson
macx:using_firewire:using_backend:EXTRA_LIBS += -F$${CONFIG_MAC_AVC} -framework AVCVideoServices

0 comments on commit a5ab063

Please sign in to comment.
Something went wrong with that request. Please try again.