From 52f6415085d8b40fc681be4c0e24087566685981 Mon Sep 17 00:00:00 2001 From: Simon Detheridge Date: Mon, 26 Jan 2015 17:50:41 +0000 Subject: [PATCH] Add nvidia config to build nvidia-compatible binary on osx/linux Also added config to build a cpu-native binary to take advantage of additional CPU features --- Builds/QtCreator/shared_settings.pri | 11 +++++++++++ Source/EmberCL/EmberCLPch.h | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/Builds/QtCreator/shared_settings.pri b/Builds/QtCreator/shared_settings.pri index 3e6143d..01a2aa9 100644 --- a/Builds/QtCreator/shared_settings.pri +++ b/Builds/QtCreator/shared_settings.pri @@ -23,6 +23,17 @@ macx { QMAKE_LFLAGS_RELEASE += -s } +nvidia { + QMAKE_CXXFLAGS += -DNVIDIA +} + +native { + QMAKE_CXXFLAGS += -march=native +} else { + QMAKE_CXXFLAGS += -march=k8 +} + + DESTDIR = $$(HOME)/Dev/fractorium/Bin LIBS += -L/usr/lib -ljpeg diff --git a/Source/EmberCL/EmberCLPch.h b/Source/EmberCL/EmberCLPch.h index 06e77b1..031555b 100644 --- a/Source/EmberCL/EmberCLPch.h +++ b/Source/EmberCL/EmberCLPch.h @@ -21,6 +21,12 @@ #endif #include + +#ifdef NVIDIA +#undef CL_VERSION_1_2 +#define CL_VERSION_1_1 +#endif + #include #include