[X2Go-Commits] [x2goclient] 04/08: macbuild.sh: define the new variables $SDK and $MACOSX_DEPLOYMENT_TARGET which can also be (pre-)set through the environment.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/cleanup
in repository x2goclient.

commit de900145bbd76ac923d274aa29762655aa09b09d
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Feb 14 05:37:55 2015 +0100

    macbuild.sh: define the new variables $SDK and $MACOSX_DEPLOYMENT_TARGET which can also be (pre-)set through the environment.
    
    Default to the 10.7 SDK and deployment target. Use the variables when calling qmake.
---
 debian/changelog |    4 ++++
 macbuild.sh      |    7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0c49152..75af266 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -176,6 +176,10 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium
     - Use more quoting and curly braces for referencing variables in
       macbuild.sh.
     - Define TOP_DIR variable in macbuild.sh -- set to $PWD.
+    - Define the new variables $SDK and $MACOSX_DEPLOYMENT_TARGET in
+      macbuild.sh which can also be (pre-)set through the environment. Default
+      to the 10.7 SDK and deployment target. Use the variables when calling
+      qmake.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 27 Nov 2014 12:01:43 +0100
 
diff --git a/macbuild.sh b/macbuild.sh
index fafce18..30944ff 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -13,6 +13,9 @@ LIBPNG="libpng15.15.dylib"
 LIBJPEG="libjpeg.9.dylib"
 LIBZ="libz.1.dylib"
 
+: SDK="${SDK:-"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"}"
+: MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET:-"10.7"}"
+
 set -e
 
 function phase() {
@@ -34,8 +37,8 @@ lrelease "$PROJECT"
 phase "Running qmake"
 qmake -config release \
 	CONFIG+=x86_64 \
-	QMAKE_MAC_SDK=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk \
-	QMAKE_MACOSX_DEPLOYMENT_TARGET=10.7
+	QMAKE_MAC_SDK="${SDK}" \
+	QMAKE_MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}"
 
 phase "Running make"
 make -j2

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git