diff --git a/makeosxbundle.sh b/makeosxbundle.sh new file mode 100755 index 0000000..021a20d --- /dev/null +++ b/makeosxbundle.sh @@ -0,0 +1,2 @@ +cp ozwdaemon simpleclient.app/Contents/MacOS/ +$1/bin/macdeployqt simpleclient.app -verbose=2 -always-overwrite -dmg diff --git a/qt-ozwdaemon/qt-ozwdaemon.pro b/qt-ozwdaemon/qt-ozwdaemon.pro index a76be26..812b8e2 100644 --- a/qt-ozwdaemon/qt-ozwdaemon.pro +++ b/qt-ozwdaemon/qt-ozwdaemon.pro @@ -2,6 +2,8 @@ QT -= gui QT += remoteobjects +TARGET = ozwdaemon + CONFIG += c++11 console silent CONFIG -= app_bundle diff --git a/qt-ozwdaemon/res/ozw_SF2_notext.png b/qt-ozwdaemon/res/ozw_SF2_notext.png new file mode 100644 index 0000000..8c8598d Binary files /dev/null and b/qt-ozwdaemon/res/ozw_SF2_notext.png differ diff --git a/qt-ozwdaemon/res/ozw_logo.icns b/qt-ozwdaemon/res/ozw_logo.icns new file mode 100644 index 0000000..aefcc90 Binary files /dev/null and b/qt-ozwdaemon/res/ozw_logo.icns differ diff --git a/qt-ozwdaemon/res/ozw_logo.ico b/qt-ozwdaemon/res/ozw_logo.ico new file mode 100644 index 0000000..2e6cca2 Binary files /dev/null and b/qt-ozwdaemon/res/ozw_logo.ico differ diff --git a/simpleclient/simpleclient.pro b/simpleclient/simpleclient.pro index 1970c81..bf0c442 100644 --- a/simpleclient/simpleclient.pro +++ b/simpleclient/simpleclient.pro @@ -1,6 +1,8 @@ QT += widgets remoteobjects testlib +TARGET = ../simpleclient + CONFIG += silent DEFINES += remote @@ -36,7 +38,7 @@ INCLUDEPATH += ../qt-openzwave/include/ macx { ICON = res/ozw_logo.icns - LIBOZW.files = ../../open-zwave/libopenzwave-1.6.dylib ../qt-openzwave/libqt-openzwave.1.0.dylib + LIBOZW.files = ../../open-zwave/libopenzwave-1.6.dylib ../qt-openzwave/libqt-openzwave.1.dylib LIBOZW.path = Contents/Frameworks/ QMAKE_BUNDLE_DATA += BUNDLE LIBOZW QMAKE_POST_LINK=$$top_srcdir/updaterpath.sh $(TARGET) diff --git a/updaterpath.sh b/updaterpath.sh index 3f5534b..fdb9cd9 100755 --- a/updaterpath.sh +++ b/updaterpath.sh @@ -1,3 +1,4 @@ #!/bin/sh -OZWPATH=`otool -L $1 | grep libopenzwave | awk '{print $1}'` +OZWPATH=`otool -L $1 | grep libopenzwave | grep compatibility | awk '{print $1}'` +echo $OZWPATH install_name_tool -change $OZWPATH @rpath/libopenzwave-1.6.dylib $1