mirror of
https://github.com/Fishwaldo/qt-openzwave.git
synced 2025-07-05 20:58:20 +00:00
Drop Framework on Mac - It was more trouble than its worth
This commit is contained in:
parent
1246c27842
commit
ed0b8778c5
4 changed files with 14 additions and 31 deletions
|
@ -84,23 +84,11 @@ unix {
|
|||
target.path = /usr/local/lib
|
||||
INSTALLS += target
|
||||
}
|
||||
LIBS += -L../../open-zwave -lopenzwave
|
||||
|
||||
macx {
|
||||
# QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
|
||||
FRAMEWORK_HEADERS.version = Versions
|
||||
FRAMEWORK_HEADERS.files = include/qt-openzwave/qtopenzwave.h include/qt-openzwave/qtozwmanager.h \
|
||||
include/qt-openzwave/qtozwproxymodels.h include/qt-openzwave/rep_qtozwmanager_source.h \
|
||||
include/qt-openzwave/qtozw_pods.h include/qt-openzwave/qtozwvalueidmodel.h \
|
||||
include/qt-openzwave/qtozwassociationmodel.h include/qt-openzwave/qtozwnodemodel.h \
|
||||
include/qt-openzwave/rep_qtozwmanager_replica.h include/qt-openzwave_global.h \
|
||||
include/qt-openzwave/qtozwoptions.h
|
||||
FRAMEWORK_HEADERS.path = Headers
|
||||
|
||||
QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
|
||||
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
|
||||
CONFIG +=lib_bundle
|
||||
} else {
|
||||
LIBS += -L../../open-zwave -lopenzwave
|
||||
QMAKE_POST_LINK=$$top_srcdir/updaterpath.sh $(TARGET)
|
||||
}
|
||||
|
||||
message(" ")
|
||||
|
|
|
@ -4,7 +4,6 @@ QT += remoteobjects
|
|||
|
||||
CONFIG += c++11 console silent
|
||||
CONFIG -= app_bundle
|
||||
CONFIG -= silent
|
||||
|
||||
# The following define makes your compiler emit warnings if you use
|
||||
# any Qt feature that has been marked deprecated (the exact warnings
|
||||
|
@ -29,14 +28,12 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
|
|||
HEADERS += \
|
||||
qtozwdaemon.h
|
||||
|
||||
LIBS += -lresolv
|
||||
LIBS += -lresolv -L../qt-openzwave/ -lqt-openzwave
|
||||
INCLUDEPATH += ../qt-openzwave/include/
|
||||
|
||||
macx {
|
||||
QMAKE_CXXFLAGS += -F../qt-openzwave/
|
||||
LIBS += -F../qt-openzwave/ -framework qt-openzwave
|
||||
ICON = res/ozw_logo.icns
|
||||
} else {
|
||||
LIBS += -L../qt-openzwave/ -lqt-openzwave
|
||||
INCLUDEPATH += ../qt-openzwave/include/
|
||||
QMAKE_POST_LINK=$$top_srcdir/updaterpath.sh $(TARGET)
|
||||
}
|
||||
|
||||
include(../qt-openzwave.pri)
|
||||
|
|
|
@ -31,19 +31,14 @@ HEADERS += \
|
|||
RESOURCES += \
|
||||
simpleclient.qrc
|
||||
|
||||
LIBS += -lresolv
|
||||
LIBS += -lresolv -L../qt-openzwave/ -lqt-openzwave
|
||||
INCLUDEPATH += ../qt-openzwave/include/
|
||||
|
||||
macx {
|
||||
QMAKE_CXXFLAGS += -F../qt-openzwave/
|
||||
LIBS += -F../qt-openzwave/ -framework qt-openzwave
|
||||
ICON = res/ozw_logo.icns
|
||||
BUNDLE.files = ../qt-openzwave/qt-openzwave.framework/
|
||||
BUNDLE.path = Contents/Frameworks/qt-openzwave.framework/
|
||||
LIBOZW.files = ../../open-zwave/libopenzwave-1.6.dylib
|
||||
LIBOZW.files = ../../open-zwave/libopenzwave-1.6.dylib ../qt-openzwave/libqt-openzwave.1.0.dylib
|
||||
LIBOZW.path = Contents/Frameworks/
|
||||
QMAKE_BUNDLE_DATA += BUNDLE LIBOZW
|
||||
INCLUDEPATH += ../qt-openzwave/qt-openzwave/include/
|
||||
} else {
|
||||
LIBS += -L../qt-openzwave/ -lqt-openzwave -L../../open-zwave -lopenzwave
|
||||
INCLUDEPATH += ../qt-openzwave/include/
|
||||
QMAKE_POST_LINK=$$top_srcdir/updaterpath.sh $(TARGET)
|
||||
}
|
||||
include(../qt-openzwave.pri)
|
||||
|
|
3
updaterpath.sh
Executable file
3
updaterpath.sh
Executable file
|
@ -0,0 +1,3 @@
|
|||
#!/bin/sh
|
||||
OZWPATH=`otool -L $1 | grep libopenzwave | awk '{print $1}'`
|
||||
install_name_tool -change $OZWPATH @rpath/libopenzwave-1.6.dylib $1
|
Loading…
Add table
Add a link
Reference in a new issue