From 8342c97efb49f11efb01c14ca8cae9cb9d84fbf5 Mon Sep 17 00:00:00 2001 From: Simon Detheridge Date: Wed, 14 Jan 2015 10:51:55 +0000 Subject: [PATCH] Fix project files for EmberGenome/Render/Animate for osx --- .../QtCreator/EmberAnimate/EmberAnimate.pro | 23 +++++++++++++++---- Builds/QtCreator/EmberGenome/EmberGenome.pro | 21 +++++++++++++---- Builds/QtCreator/EmberRender/EmberRender.pro | 21 +++++++++++++---- 3 files changed, 53 insertions(+), 12 deletions(-) diff --git a/Builds/QtCreator/EmberAnimate/EmberAnimate.pro b/Builds/QtCreator/EmberAnimate/EmberAnimate.pro index 206bdb8..2c710b9 100644 --- a/Builds/QtCreator/EmberAnimate/EmberAnimate.pro +++ b/Builds/QtCreator/EmberAnimate/EmberAnimate.pro @@ -1,15 +1,19 @@ TEMPLATE = app CONFIG += console CONFIG += warn_off -CONFIG += precompile_header +!macx:CONFIG += precompile_header CONFIG -= app_bundle CONFIG -= qt VERSION = 0.1.4.7 DESTDIR = $$(HOME)/Dev/fractorium/Bin -LIBS += -L/usr/lib -lOpenCL -LIBS += -L/usr/lib -lGL +!macx:LIBS += -L/usr/lib -lOpenCL +macx:LIBS += -framework OpenCL + +!macx:LIBS += -L/usr/lib -lGL +macx:LIBS += -framework OpenGL + LIBS += -L/usr/lib -ljpeg LIBS += -L/usr/lib -lpng LIBS += -L/usr/lib/x86_64-linux-gnu -lxml2 @@ -25,6 +29,15 @@ INCLUDEPATH += ../../../Source/Ember INCLUDEPATH += ../../../Source/EmberCL INCLUDEPATH += ../../../Source/EmberCommon +# homebrew installs into /usr/local +macx:LIBS += -L/usr/local/lib + +macx:INCLUDEPATH += /usr/local/include +macx:INCLUDEPATH += ../../../Deps + +macx:QMAKE_MAC_SDK = macosx10.9 +macx:QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 + QMAKE_CXXFLAGS_RELEASE += -O2 QMAKE_CXXFLAGS_RELEASE += -DNDEBUG @@ -57,9 +70,11 @@ QMAKE_CXXFLAGS += -D_USRDLL QMAKE_CXXFLAGS += -DNDEBUG QMAKE_CXXFLAGS += -D_CONSOLE +macx:QMAKE_CXXFLAGS += -stdlib=libc++ + QMAKE_LFLAGS_RELEASE += -s -PRECOMPILED_HEADER = ../../../Source/EmberCommon/EmberCommonPch.h +!macx:PRECOMPILED_HEADER = ../../../Source/EmberCommon/EmberCommonPch.h SOURCES += \ ../../../Source/EmberAnimate/EmberAnimate.cpp \ diff --git a/Builds/QtCreator/EmberGenome/EmberGenome.pro b/Builds/QtCreator/EmberGenome/EmberGenome.pro index 7fddeb5..e43db5f 100644 --- a/Builds/QtCreator/EmberGenome/EmberGenome.pro +++ b/Builds/QtCreator/EmberGenome/EmberGenome.pro @@ -1,15 +1,19 @@ TEMPLATE = app CONFIG += console CONFIG += warn_off -CONFIG += precompile_header +!macx:CONFIG += precompile_header CONFIG -= app_bundle CONFIG -= qt VERSION = 0.1.4.7 DESTDIR = $$(HOME)/Dev/fractorium/Bin -LIBS += -L/usr/lib -lOpenCL -LIBS += -L/usr/lib -lGL +!macx:LIBS += -L/usr/lib -lOpenCL +macx:LIBS += -framework OpenCL + +!macx:LIBS += -L/usr/lib -lGL +macx:LIBS += -framework OpenGL + LIBS += -L/usr/lib -ljpeg LIBS += -L/usr/lib -lpng LIBS += -L/usr/lib/x86_64-linux-gnu -lxml2 @@ -25,6 +29,15 @@ INCLUDEPATH += ../../../Source/Ember INCLUDEPATH += ../../../Source/EmberCL INCLUDEPATH += ../../../Source/EmberCommon +# homebrew installs into /usr/local +macx:LIBS += -L/usr/local/lib + +macx:INCLUDEPATH += /usr/local/include +macx:INCLUDEPATH += ../../../Deps + +macx:QMAKE_MAC_SDK = macosx10.9 +macx:QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 + QMAKE_CXXFLAGS_RELEASE += -O2 QMAKE_CXXFLAGS_RELEASE += -DNDEBUG @@ -59,7 +72,7 @@ QMAKE_CXXFLAGS += -D_CONSOLE QMAKE_LFLAGS_RELEASE += -s -PRECOMPILED_HEADER = ../../../Source/EmberCommon/EmberCommonPch.h +!macx:PRECOMPILED_HEADER = ../../../Source/EmberCommon/EmberCommonPch.h SOURCES += \ ../../../Source/EmberGenome/EmberGenome.cpp \ diff --git a/Builds/QtCreator/EmberRender/EmberRender.pro b/Builds/QtCreator/EmberRender/EmberRender.pro index cde41c2..dcab509 100644 --- a/Builds/QtCreator/EmberRender/EmberRender.pro +++ b/Builds/QtCreator/EmberRender/EmberRender.pro @@ -1,15 +1,19 @@ TEMPLATE = app CONFIG += console CONFIG += warn_off -CONFIG += precompile_header +!macx:CONFIG += precompile_header CONFIG -= app_bundle CONFIG -= qt VERSION = 0.1.4.7 DESTDIR = $$(HOME)/Dev/fractorium/Bin -LIBS += -L/usr/lib -lOpenCL -LIBS += -L/usr/lib -lGL +!macx:LIBS += -L/usr/lib -lOpenCL +macx:LIBS += -framework OpenCL + +!macx:LIBS += -L/usr/lib -lGL +macx:LIBS += -framework OpenGL + LIBS += -L/usr/lib -ljpeg LIBS += -L/usr/lib -lpng LIBS += -L/usr/lib/x86_64-linux-gnu -lxml2 @@ -25,6 +29,15 @@ INCLUDEPATH += ../../../Source/Ember INCLUDEPATH += ../../../Source/EmberCL INCLUDEPATH += ../../../Source/EmberCommon +# homebrew installs into /usr/local +macx:LIBS += -L/usr/local/lib + +macx:INCLUDEPATH += /usr/local/include +macx:INCLUDEPATH += ../../../Deps + +macx:QMAKE_MAC_SDK = macosx10.9 +macx:QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 + QMAKE_CXXFLAGS_RELEASE += -O2 QMAKE_CXXFLAGS_RELEASE += -DNDEBUG @@ -59,7 +72,7 @@ QMAKE_CXXFLAGS += -D_CONSOLE QMAKE_LFLAGS_RELEASE += -s -PRECOMPILED_HEADER = ../../../Source/EmberCommon/EmberCommonPch.h +!macx:PRECOMPILED_HEADER = ../../../Source/EmberCommon/EmberCommonPch.h SOURCES += \ ../../../Source/EmberRender/EmberRender.cpp \