diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-02-24 03:54:53 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-02-24 03:54:53 (GMT) |
| commit | ca41979ee514f642c506e4f4d81461f19b587bf2 (patch) | |
| tree | f31feb004d0b724d5240c8a227c7f0c886939a1b /openscad.pro | |
| parent | eff16283358217b43b310269a72e0cb47357a8b3 (diff) | |
| parent | abc9da96c89b337377ee62ac29ee54e4e7b0a514 (diff) | |
Merge branch 'master' of github.com:openscad/openscad into issue11_2
Conflicts:
RELEASE_NOTES
openscad.pro
src/mainwin.cc
Diffstat (limited to 'openscad.pro')
| -rw-r--r-- | openscad.pro | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/openscad.pro b/openscad.pro index 15f76f8..5d71d91 100644 --- a/openscad.pro +++ b/openscad.pro @@ -66,9 +66,9 @@ macx { ICON = icons/OpenSCAD.icns QMAKE_INFO_PLIST = Info.plist APP_RESOURCES.path = Contents/Resources - APP_RESOURCES.files = OpenSCAD.sdef + APP_RESOURCES.files = OpenSCAD.sdef dsa_pub.pem icons/SCAD.icns QMAKE_BUNDLE_DATA += APP_RESOURCES - LIBS += -framework Cocoa + LIBS += -framework Cocoa -framework Sparkle } else { TARGET = openscad @@ -242,6 +242,8 @@ HEADERS += src/version_check.h \ src/imageutils.h \ src/system-gl.h \ src/CsgInfo.h + \ + src/AutoUpdater.h SOURCES += src/version_check.cc \ src/ProgressWidget.cc \ @@ -289,6 +291,7 @@ SOURCES += src/version_check.cc \ src/editor.cc \ src/qglview.cc \ src/GLView.cc \ + src/AutoUpdater.cc \ \ src/builtin.cc \ src/export.cc \ @@ -352,8 +355,12 @@ SOURCES += src/cgalutils.cc \ macx { HEADERS += src/AppleEvents.h \ - src/EventFilter.h + src/EventFilter.h \ + src/SparkleAutoUpdater.h \ + src/CocoaUtils.h SOURCES += src/AppleEvents.cc + OBJECTIVE_SOURCES += src/SparkleAutoUpdater.mm \ + src/CocoaUtils.mm } isEmpty(PREFIX):PREFIX = /usr/local |