Merge branch 'master' of github.com:openscad/openscad

Conflicts:
	openscad.pro

1 files changed, 19 insertions, 15 deletions

diff --git a/openscad.pro b/openscad.pro
index a2d2678..d9442d4 100644
--- a/openscad.pro
+++ b/openscad.pro
@@ -55,12 +55,26 @@ else {
   }
 }
 
-macx {
-  # add CONFIG+=deploy to the qmake command-line to make a deployment build
-  deploy {
-    message("Building deployment version")
+# add CONFIG+=deploy to the qmake command-line to make a deployment build
+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
   }
+}
+
+macx {
+  TARGET = OpenSCAD
+  ICON = icons/OpenSCAD.icns
+  QMAKE_INFO_PLIST = Info.plist
+  APP_RESOURCES.path = Contents/Resources
+  APP_RESOURCES.files = OpenSCAD.sdef dsa_pub.pem icons/SCAD.icns
+  QMAKE_BUNDLE_DATA += APP_RESOURCES
+  LIBS += -framework Cocoa
 
   # FIXME: Somehow, setting the deployment target to a lower version causes a
   # seldom crash in debug mode (e.g. the minkowski2-test):
@@ -69,14 +83,6 @@ macx {
   # The reason for the crash appears to be linking with libgcc_s, 
   # but it's unclear what's really going on
   QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
-
-  TARGET = OpenSCAD
-  ICON = icons/OpenSCAD.icns
-  QMAKE_INFO_PLIST = Info.plist
-  APP_RESOURCES.path = Contents/Resources
-  APP_RESOURCES.files = OpenSCAD.sdef dsa_pub.pem icons/SCAD.icns
-  QMAKE_BUNDLE_DATA += APP_RESOURCES
-  LIBS += -framework Cocoa -framework Sparkle
 }
 else {
   TARGET = openscad
@@ -365,11 +371,9 @@ SOURCES += src/cgalutils.cc \
 macx {
   HEADERS += src/AppleEvents.h \
              src/EventFilter.h \
-             src/SparkleAutoUpdater.h \
              src/CocoaUtils.h
   SOURCES += src/AppleEvents.cc
-  OBJECTIVE_SOURCES += src/SparkleAutoUpdater.mm \
-             src/CocoaUtils.mm
+  OBJECTIVE_SOURCES += src/CocoaUtils.mm
 }
 
 isEmpty(PREFIX):PREFIX = /usr/local