Verified Commit 4f3b3296 authored by Bryan Gardiner's avatar Bryan Gardiner

Merge Mac support.

parents ef0713b1 2ee843ca
......@@ -21,7 +21,7 @@
set -euo pipefail
if [[ $(uname) = Darwin ]] && which greadlink >/dev/null 2>&1; then
alias readlink=greadlink
readlink() { greadlink "$@"; }
fi
projectDir=$(readlink -f "$0")
projectDir=$(dirname "$projectDir")
......
......@@ -21,7 +21,7 @@
set -euo pipefail
if [[ $(uname) = Darwin ]] && which greadlink >/dev/null 2>&1; then
alias readlink=greadlink
readlink() { greadlink "$@"; }
fi
projectDir=$(readlink -f "$0")
projectDir=$(dirname "$projectDir")
......
......@@ -215,7 +215,7 @@ doClean cleanFlags = do
filter (\file ->
"b_" `isPrefixOf` file ||
"moc_" `isPrefixOf` file ||
"libqtah.so" `isPrefixOf` file ||
"libqtah" `isPrefixOf` file ||
".o" `isSuffixOf` file ||
file `elem` ["Makefile",
"callback.cpp", "callback.hpp",
......
......@@ -25,6 +25,8 @@ VERSION = 0.2.0
# Doesn't seem to work here: CONFIG += c++11
QMAKE_CXXFLAGS += -std=c++11
mac:QMAKE_SONAME_PREFIX = @rpath
SOURCES += \
$$files(b_*.cpp) \
$$files(wrap_*.cpp) \
......
......@@ -26,7 +26,7 @@
set -euo pipefail
if [[ $(uname) = Darwin ]] && which greadlink >/dev/null 2>&1; then
alias readlink=greadlink
readlink() { greadlink "$@"; }
fi
projectDir=$(readlink -f "$0")
projectDir=$(dirname "$projectDir")
......
......@@ -22,7 +22,7 @@
set -euo pipefail # "Unofficial Bash strict mode."
if [[ $(uname) = Darwin ]] && which greadlink >/dev/null 2>&1; then
alias readlink=greadlink
readlink() { greadlink "$@"; }
fi
# Merging these lines won't cause the command to fail (for set -e).
......
......@@ -22,7 +22,7 @@
set -euo pipefail
if [[ $(uname) = Darwin ]] && which greadlink >/dev/null 2>&1; then
alias readlink=greadlink
readlink() { greadlink "$@"; }
fi
qtahDir=$(readlink -f "$0")
qtahDir=$(dirname "$qtahDir")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment