Skip to content

Commit

Permalink
OSX: fix compile issues with different STL versions starting from 10.7
Browse files Browse the repository at this point in the history
  • Loading branch information
flanggut committed Jan 7, 2015
1 parent 2874e24 commit 954fde1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Makefile.inc
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ CXXFLAGS += -pthread
UNAME = $(shell uname)
ifeq (${UNAME},Darwin)
# Use a recent OS X SDK - homebrew qt5 needs it.
CXXFLAGS += -mmacosx-version-min=10.6
LDFLAGS += -mmacosx-version-min=10.6
OPENMP =
CXXFLAGS += -mmacosx-version-min=10.7
LDFLAGS += -mmacosx-version-min=10.7
endif

COMPILE.cc = ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c
Expand Down
1 change: 1 addition & 0 deletions apps/umve/umve.pro
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ RCC_DIR = build

# Options specific to OS X.
macx {
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
CONFIG -= app_bundle
QMAKE_LFLAGS += -L/usr/local/lib
QMAKE_LFLAGS -= -fopenmp
Expand Down

0 comments on commit 954fde1

Please sign in to comment.