diff options
| author | Marius Kintel <marius@kintel.net> | 2014-01-04 23:03:33 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2014-01-04 23:03:33 (GMT) |
| commit | 62b9746ab1207ede256797353bb5f6777c73f638 (patch) | |
| tree | 33ae627cc9a79ead388bd543d83e791d5d7eade9 | |
| parent | e3f416db27338e1656dc266470cbb9de48ddd11f (diff) | |
Mac fixes: Moved sparkle config to sparkle.pri. Link with ApplicationServices
| -rw-r--r-- | common.pri | 3 | ||||
| -rw-r--r-- | openscad.pro | 8 | ||||
| -rw-r--r-- | sparkle.pri | 11 |
3 files changed, 16 insertions, 6 deletions
@@ -11,4 +11,5 @@ include(opencsg.pri) include(glew.pri) include(eigen.pri) include(boost.pri) -include(glib-2.0.pri)
\ No newline at end of file +include(glib-2.0.pri) +include(sparkle.pri) diff --git a/openscad.pro b/openscad.pro index 20dc299..913a5d3 100644 --- a/openscad.pro +++ b/openscad.pro @@ -61,10 +61,8 @@ deploy { message("Building deployment version") DEFINES += OPENSCAD_DEPLOY macx { - CONFIG += x86 x86_64 - LIBS += -framework Sparkle - HEADERS += src/SparkleAutoUpdater.h - OBJECTIVE_SOURCES += src/SparkleAutoUpdater.mm + CONFIG += x86_64 + CONFIG += sparkle } } @@ -75,7 +73,7 @@ macx { APP_RESOURCES.path = Contents/Resources APP_RESOURCES.files = OpenSCAD.sdef dsa_pub.pem icons/SCAD.icns QMAKE_BUNDLE_DATA += APP_RESOURCES - LIBS += -framework Cocoa + LIBS += -framework Cocoa -framework ApplicationServices # FIXME: Somehow, setting the deployment target to a lower version causes a # seldom crash in debug mode (e.g. the minkowski2-test): diff --git a/sparkle.pri b/sparkle.pri new file mode 100644 index 0000000..2f71b03 --- /dev/null +++ b/sparkle.pri @@ -0,0 +1,11 @@ +sparkle { + OPENSCAD_LIBRARIES_DIR = $$(OPENSCAD_LIBRARIES) + !isEmpty(OPENSCAD_LIBRARIES_DIR) { + QMAKE_OBJECTIVE_CFLAGS +=-F$$OPENSCAD_LIBRARIES_DIR/lib + QMAKE_LFLAGS +=-F$$OPENSCAD_LIBRARIES_DIR/lib + } + + LIBS += -framework Sparkle + HEADERS += src/SparkleAutoUpdater.h + OBJECTIVE_SOURCES += src/SparkleAutoUpdater.mm +} |