From 2ee0eb793f8a89be1bdd0d5e5297638d2e778632 Mon Sep 17 00:00:00 2001
From: Claudio Valerio <vitonightfly@gmail.com>
Date: Sat, 28 Feb 2015 12:21:00 +0100
Subject: [PATCH] Mac Os X : Defined variable for conditional build
---
release.macx.sh | 17 +++++++++++++----
src/frameworks/UBPlatformUtils_mac.mm | 3 ++-
2 files changed, 15 insertions(+), 5 deletions(-)
mode change 100644 => 100755 release.macx.sh
diff --git a/release.macx.sh b/release.macx.sh
old mode 100644
new mode 100755
index d7ab746a..8db95f16
--- a/release.macx.sh
+++ b/release.macx.sh
@@ -136,8 +136,12 @@ $LRELEASE "$APPLICATION_NAME.pro"
# generate Makefiles
notify "Generating Makefile ..."
-QMAKE_CMD="$QMAKE $APPLICATION_NAME.pro -spec macx-g++"
+if [ "$1" == "1010" ]; then
+ QMAKE_CMD="$QMAKE \"DEFINES+=OS_NEWER_THAN_OR_EQUAL_TO_1010\" $APPLICATION_NAME.pro -spec macx-g++"
+else
+ QMAKE_CMD="$QMAKE $APPLICATION_NAME.pro -spec macx-g++"
+fi
$QMAKE_CMD
# build
@@ -169,8 +173,8 @@ if [ $? != 0 ]; then
abort "compilation failed"
fi
-
DMG="$APPLICATION_NAME.dmg"
+
VOLUME="/Volumes/$APPLICATION_NAME"
APP="$PRODUCT_DIR/$APPLICATION_NAME.app"
DSYM_NAME="$APPLICATION_NAME (r$SVN_REVISION).dSYM"
@@ -232,7 +236,6 @@ $DMGUTIL --set --iconsize=96 --toolbar=false --icon=resources/macx/OpenBoard.icn
$DMGUTIL --set --x=20 --y=60 --width=580 --height=440 "$VOLUME"
$DMGUTIL --set --x=180 --y=120 "$VOLUME/`basename \"$APP\"`"
$DMGUTIL --set --x=400 --y=120 "$VOLUME/Applications"
-#$DMGUTIL --set --x=180 --y=280 "$VOLUME/ReleaseNotes.pdf"
$DMGUTIL --close --volume="$APPLICATION_NAME" "$DMG"
@@ -244,7 +247,13 @@ if [ ! -d "${PRODUCT_DIR}" ]; then
mkdir -p "${PRODUCT_DIR}"
fi
-mv "$DMG" "${PRODUCT_DIR}"
+
+if [ "$1" == "1010" ]; then
+ mv "$DMG" "${PRODUCT_DIR}/OpenBoard_for_1010.dmg"
+else
+ mv "$DMG" "${PRODUCT_DIR}"
+fi
+
exit 0
diff --git a/src/frameworks/UBPlatformUtils_mac.mm b/src/frameworks/UBPlatformUtils_mac.mm
index cbbbfc75..9b73b850 100644
--- a/src/frameworks/UBPlatformUtils_mac.mm
+++ b/src/frameworks/UBPlatformUtils_mac.mm
@@ -93,6 +93,7 @@ void UBPlatformUtils::init()
void UBPlatformUtils::setDesktopMode(bool desktop)
{
+#ifndef OS_NEWER_THAN_OR_EQUAL_TO_1010
OSStatus (*functor)(SystemUIMode, SystemUIOptions) = (OSStatus (*)(SystemUIMode, SystemUIOptions))originalSetSystemUIMode;
if (desktop)
@@ -103,7 +104,7 @@ void UBPlatformUtils::setDesktopMode(bool desktop)
{
functor(kUIModeAllHidden, 0);
}
-
+#endif
}