From 0a18a0507ab383741f6a6e9bc6b2f363da2a913c Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 8 Apr 2014 03:46:10 +0100 Subject: [PATCH] misc --- data/macos/build.sh | 2 ++ data/macos/env-vars.sh | 9 +++++++++ source/Makefile.mk | 2 ++ 3 files changed, 13 insertions(+) create mode 100755 data/macos/env-vars.sh diff --git a/data/macos/build.sh b/data/macos/build.sh index 733e30a82..80da131e7 100755 --- a/data/macos/build.sh +++ b/data/macos/build.sh @@ -22,6 +22,8 @@ else export PYRCC="pyrcc4-3.3 -py3" fi +./configure -prefix /Users/falktx/Source/Qt-5.2.1 -release -opensource -confirm-license -no-c++11 -no-javascript-jit -no-qml-debug -force-pkg-config -qt-zlib -no-mtdev -no-gif -qt-libpng -qt-libjpeg -qt-freetype -no-openssl -qt-pcre -no-xinput2 -no-xcb-xlib -no-glib -no-cups -no-iconv -no-icu -no-fontconfig -no-dbus -no-xcb -no-eglfs -no-directfb -no-linuxfb -no-kms -no-compile-examples -nomake examples -nomake tests -make tools -make libs -qt-sql-sqlite -no-framework -no-sql-odbc + # Clean build make clean diff --git a/data/macos/env-vars.sh b/data/macos/env-vars.sh new file mode 100755 index 000000000..94372b44f --- /dev/null +++ b/data/macos/env-vars.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +export MACOS="true" +export CC="gcc-4.2" +export CXX="g++-4.2" +export CXXFLAGS="-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_5 -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_5" +export PYUIC="/opt/local/Library/Frameworks/Python.framework/Versions/3.3/bin/pyuic5" +export PYRCC="/opt/local/Library/Frameworks/Python.framework/Versions/3.3/bin/pyrcc5" +export PKG_CONFIG_PATH="/Users/falktx/Source/Qt-5.2.1/lib/pkgconfig" diff --git a/source/Makefile.mk b/source/Makefile.mk index a1e85b4cf..6a1c8f67d 100644 --- a/source/Makefile.mk +++ b/source/Makefile.mk @@ -115,7 +115,9 @@ endif # -------------------------------------------------------------- # Check for qt, set default version (prefer qt4) +ifneq ($(MACOS),true) HAVE_QT4 = $(shell pkg-config --exists QtCore QtGui QtXml && echo true) +endif HAVE_QT5 = $(shell pkg-config --exists Qt5Core Qt5Gui Qt5Xml Qt5Widgets && echo true) ifeq ($(HAVE_QT5),true)