Permalink
Browse files

Fix mac compilations following UTC and qjson changes

  • Loading branch information...
1 parent a336dc1 commit cb5d81f9cba00780519705b423749b301b93a298 @jyavenard jyavenard committed Jun 16, 2012
View
@@ -29,14 +29,14 @@ zeromq-install zeromq-uninstall zeromq-clean zeromq-distclean:
${MAKE} -C zeromq ${@:zeromq-%=%}
nzmqt-all: zeromq-all
- (cd nzmqt/src ; ${QMAKE})
+ (cd nzmqt/src ; ${QMAKE} -o Makefile)
${MAKE} -C nzmqt/src all
nzmqt-install nzmqt-uninstall nzmqt-clean nzmqt-distclean:
${MAKE} -C nzmqt/src ${@:nzmqt-%=%}
qjson-all:
- (cd qjson ; ${QMAKE})
+ (cd qjson ; ${QMAKE} -o Makefile)
-[ -f qjson/include/QJson ] && \
(cd qjson/include ; ${RM} QJson ; ${LN_S} ../src QJson)
${MAKE} -C qjson all
@@ -19,7 +19,6 @@ windows: {
DEFINES += QJSON_MAKEDLL
}
-#
# MythTV OS X build fix. We want a dynamic library (like all our other libs),
# and not something like ../lib/mythqjson.framework/Versions/0/mythqjson
# so comment out this line:
@@ -29,6 +29,7 @@ using namespace std;
#include "darwinavcinfo.h"
#include "mythlogging.h"
#include "mthread.h"
+#include "mythtimer.h"
// Apple Firewire example headers
#include <AVCVideoServices/StringLogger.h>

0 comments on commit cb5d81f

Please sign in to comment.