Skip to content

Commit

Permalink
We now require OS X >= 10.8
Browse files Browse the repository at this point in the history
  • Loading branch information
kintel committed Jul 15, 2016
1 parent 557d15c commit 204032b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 19 deletions.
2 changes: 0 additions & 2 deletions c++11.pri
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ macx {
QMAKE_CXXFLAGS += -stdlib=libc++
QMAKE_LFLAGS += -stdlib=libc++
QMAKE_OBJECTIVE_CFLAGS += -stdlib=libc++
# libc++ on requires Mac OS X 10.7+
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
}
}

Expand Down
1 change: 1 addition & 0 deletions openscad.pro
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ macx {
APP_RESOURCES.files = OpenSCAD.sdef dsa_pub.pem icons/SCAD.icns
QMAKE_BUNDLE_DATA += APP_RESOURCES
LIBS += -framework Cocoa -framework ApplicationServices
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
}


Expand Down
20 changes: 3 additions & 17 deletions scripts/macosx-build-dependencies.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
#
# This script builds all library dependencies of OpenSCAD for Mac OS X.
# The libraries will be build in 64-bit mode and backwards compatible with 10.7 "Lion".
# The libraries will be build in 64-bit mode and backwards compatible with 10.8 "Mountain Lion".
#
# This script must be run from the OpenSCAD source root directory
#
Expand All @@ -23,10 +23,9 @@ BASEDIR=$PWD/../libraries
OPENSCADDIR=$PWD
SRCDIR=$BASEDIR/src
DEPLOYDIR=$BASEDIR/install
MAC_OSX_VERSION_MIN=10.7
MAC_OSX_VERSION_MIN=10.8
OPTION_LLVM=false
OPTION_CLANG=false
OPTION_GCC=false
OPTION_DEPLOY=false
OPTION_FORCE=0
OPTION_CXX11=true
Expand Down Expand Up @@ -757,19 +756,14 @@ elif (( $OSX_VERSION >= 9 )); then
echo "Detected Mavericks (10.9)"
elif (( $OSX_VERSION >= 8 )); then
echo "Detected Mountain Lion (10.8)"
elif (( $OSX_VERSION >= 7 )); then
echo "Detected Lion (10.7)"
else
echo "Detected Snow Leopard (10.6) or earlier"
echo "Detected Lion (10.7) or earlier"
fi

USING_LLVM=false
USING_GCC=false
USING_CLANG=false
if $OPTION_LLVM; then
USING_LLVM=true
elif $OPTION_GCC; then
USING_GCC=true
elif $OPTION_CLANG; then
USING_CLANG=true
elif (( $OSX_VERSION >= 7 )); then
Expand All @@ -781,14 +775,6 @@ if $USING_LLVM; then
export CC=llvm-gcc
export CXX=llvm-g++
export QMAKESPEC=macx-llvm
elif $USING_GCC; then
echo "Using gcc compiler"
export CC=gcc
export CXX=g++
export CPP=cpp
# Somehow, qmake in Qt-4.8.2 doesn't detect Lion's gcc and falls back into
# project file mode unless manually given a QMAKESPEC
export QMAKESPEC=macx-llvm
elif $USING_CLANG; then
echo "Using clang compiler"
export CC=clang
Expand Down

0 comments on commit 204032b

Please sign in to comment.