diff --git a/Builds/MSVC/Solution/EmberAnimate.vcxproj b/Builds/MSVC/Solution/EmberAnimate.vcxproj
index b23f389..1391a8b 100644
--- a/Builds/MSVC/Solution/EmberAnimate.vcxproj
+++ b/Builds/MSVC/Solution/EmberAnimate.vcxproj
@@ -61,7 +61,7 @@
Disabled
WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(TargetDir)$(TargetName).pdb
- $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\openexr\output\include\Imath;$(ProjectDir)..\..\..\..\openexr\output\include\OpenEXR
+ $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\openexr\output\include\Imath;$(ProjectDir)..\..\..\..\openexr\output\include\OpenEXR;$(ProjectDir)..\..\..\Builds\include\CLs\CL3.0
EmberCommonPch.h
@@ -94,7 +94,7 @@ xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)"
true
WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(TargetDir)$(TargetName).pdb
- $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\openexr\output\include\Imath;$(ProjectDir)..\..\..\..\openexr\output\include\OpenEXR
+ $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\openexr\output\include\Imath;$(ProjectDir)..\..\..\..\openexr\output\include\OpenEXR;$(ProjectDir)..\..\..\Builds\include\CLs\CL3.0
EmberCommonPch.h
diff --git a/Builds/MSVC/Solution/EmberCL.vcxproj b/Builds/MSVC/Solution/EmberCL.vcxproj
index 7fa2503..8f9a45e 100644
--- a/Builds/MSVC/Solution/EmberCL.vcxproj
+++ b/Builds/MSVC/Solution/EmberCL.vcxproj
@@ -63,7 +63,7 @@
$(TargetDir)$(TargetName).pdb
- $(ProjectDir)..\..\..\Source\Ember\;$(ProjectDir)..\..\..\Source\EmberCL\;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libxml2\include
+ $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\Builds\include\CLs\CL3.0
Default
EmberCLPch.h
true
@@ -92,7 +92,7 @@
$(TargetDir)$(TargetName).pdb
- $(ProjectDir)..\..\..\Source\Ember\;$(ProjectDir)..\..\..\Source\EmberCL\;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libxml2\include
+ $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\Builds\include\CLs\CL3.0
Speed
EmberCLPch.h
/bigobj %(AdditionalOptions)
diff --git a/Builds/MSVC/Solution/EmberGenome.vcxproj b/Builds/MSVC/Solution/EmberGenome.vcxproj
index 2c932f0..48da8ec 100644
--- a/Builds/MSVC/Solution/EmberGenome.vcxproj
+++ b/Builds/MSVC/Solution/EmberGenome.vcxproj
@@ -61,7 +61,7 @@
Disabled
WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(TargetDir)$(TargetName).pdb
- $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\openexr\output\include\Imath;$(ProjectDir)..\..\..\..\openexr\output\include\OpenEXR
+ $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\openexr\output\include\Imath;$(ProjectDir)..\..\..\..\openexr\output\include\OpenEXR;$(ProjectDir)..\..\..\Builds\include\CLs\CL3.0
EmberCommonPch.h
@@ -94,7 +94,7 @@ xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)"
true
WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(TargetDir)$(TargetName).pdb
- $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\openexr\output\include\Imath;$(ProjectDir)..\..\..\..\openexr\output\include\OpenEXR
+ $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\openexr\output\include\Imath;$(ProjectDir)..\..\..\..\openexr\output\include\OpenEXR;$(ProjectDir)..\..\..\Builds\include\CLs\CL3.0
EmberCommonPch.h
diff --git a/Builds/MSVC/Solution/EmberRender.vcxproj b/Builds/MSVC/Solution/EmberRender.vcxproj
index d658f99..4b14456 100644
--- a/Builds/MSVC/Solution/EmberRender.vcxproj
+++ b/Builds/MSVC/Solution/EmberRender.vcxproj
@@ -61,7 +61,7 @@
Disabled
WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(TargetDir)$(TargetName).pdb
- $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\openexr\output\include\Imath;$(ProjectDir)..\..\..\..\openexr\output\include\OpenEXR
+ $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\openexr\output\include\Imath;$(ProjectDir)..\..\..\..\openexr\output\include\OpenEXR;$(ProjectDir)..\..\..\Builds\include\CLs\CL3.0
EmberCommonPch.h
@@ -94,7 +94,7 @@ xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)"
true
WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(TargetDir)$(TargetName).pdb
- $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\openexr\output\include\Imath;$(ProjectDir)..\..\..\..\openexr\output\include\OpenEXR
+ $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\openexr\output\include\Imath;$(ProjectDir)..\..\..\..\openexr\output\include\OpenEXR;$(ProjectDir)..\..\..\Builds\include\CLs\CL3.0
EmberCommonPch.h
diff --git a/Builds/MSVC/Solution/EmberTester.vcxproj b/Builds/MSVC/Solution/EmberTester.vcxproj
index 1de15fd..9593375 100644
--- a/Builds/MSVC/Solution/EmberTester.vcxproj
+++ b/Builds/MSVC/Solution/EmberTester.vcxproj
@@ -63,7 +63,7 @@
Disabled
WIN32;_DEBUG;_CONSOLE;OPENEXR_DLL;%(PreprocessorDefinitions)
$(TargetDir)$(TargetName).pdb
- $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\openexr\output\include\Imath;$(ProjectDir)..\..\..\..\openexr\output\include\OpenEXR
+ $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\openexr\output\include\Imath;$(ProjectDir)..\..\..\..\openexr\output\include\OpenEXR;$(ProjectDir)..\..\..\Builds\include\CLs\CL3.0
EmberCommonPch.h
@@ -96,7 +96,7 @@ xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)"
true
WIN32;NDEBUG;_CONSOLE;OPENEXR_DLL;%(PreprocessorDefinitions)
$(TargetDir)$(TargetName).pdb
- $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\openexr\output\include\Imath;$(ProjectDir)..\..\..\..\openexr\output\include\OpenEXR
+ $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\openexr\output\include\Imath;$(ProjectDir)..\..\..\..\openexr\output\include\OpenEXR;$(ProjectDir)..\..\..\Builds\include\CLs\CL3.0
EmberCommonPch.h
diff --git a/Builds/MSVC/Solution/Fractorium.vcxproj b/Builds/MSVC/Solution/Fractorium.vcxproj
index cc377e6..2b9fb55 100644
--- a/Builds/MSVC/Solution/Fractorium.vcxproj
+++ b/Builds/MSVC/Solution/Fractorium.vcxproj
@@ -62,7 +62,7 @@
UNICODE;WIN32;QT_CORE_LIB;QT_GUI_LIB;QT_MULTIMEDIA_LIB;QT_HELP_LIB;QT_OPENGL_LIB;QT_WIDGETS_LIB;QT_XML_LIB;%(PreprocessorDefinitions)
- .;.\PaletteEditor;$(QTDIR)\include;$(ProjectDir)..\..\..\Fractorium\GeneratedFiles;$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName;$(QTDIR)\..\qtmultimedia\include\QtMultimedia;$(QTDIR)\..\qtmultimedia\include;$(QTDIR)\..\qttools\include;$(QTDIR)\..\qttools\include\QtHelp;$(QTDIR)\include\QtConcurrent;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtOpenGL;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtXml;.\GeneratedFiles;$(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\Fractorium;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\openexr\output\include\Imath;$(ProjectDir)..\..\..\..\openexr\output\include\OpenEXR;.\GeneratedFiles\$(ConfigurationName);%(AdditionalIncludeDirectories)
+ .;.\PaletteEditor;$(QTDIR)\include;$(ProjectDir)..\..\..\Fractorium\GeneratedFiles;$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName;$(QTDIR)\..\qtmultimedia\include\QtMultimedia;$(QTDIR)\..\qtmultimedia\include;$(QTDIR)\..\qttools\include;$(QTDIR)\..\qttools\include\QtHelp;$(QTDIR)\include\QtConcurrent;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtOpenGL;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtXml;.\GeneratedFiles;$(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\Fractorium;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\openexr\output\include\Imath;$(ProjectDir)..\..\..\..\openexr\output\include\OpenEXR;$(ProjectDir)..\..\..\Builds\include\CLs\CL3.0;.\GeneratedFiles\$(ConfigurationName);%(AdditionalIncludeDirectories)
Disabled
ProgramDatabase
MultiThreadedDebugDLL
@@ -107,7 +107,7 @@ xcopy /F /Y /R /D "$(QTDIR)\plugins\imageformats\qjpegd.dll" "$(OutDir)\imagefor
UNICODE;WIN32;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_MULTIMEDIA_LIB;QT_HELP_LIB;QT_OPENGL_LIB;QT_WIDGETS_LIB;QT_XML_LIB;%(PreprocessorDefinitions)
- .;.\PaletteEditor;$(QTDIR)\include;$(ProjectDir)..\..\..\Fractorium\GeneratedFiles;$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName;$(QTDIR)\..\qtmultimedia\include\QtMultimedia;$(QTDIR)\..\qtmultimedia\include;$(QTDIR)\..\qttools\include;$(QTDIR)\..\qttools\include\QtHelp;$(QTDIR)\include\QtConcurrent;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtOpenGL;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtXml;.\GeneratedFiles;$(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\Fractorium;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\openexr\output\include\Imath;$(ProjectDir)..\..\..\..\openexr\output\include\OpenEXR;.\GeneratedFiles\$(ConfigurationName);%(AdditionalIncludeDirectories)
+ .;.\PaletteEditor;$(QTDIR)\include;$(ProjectDir)..\..\..\Fractorium\GeneratedFiles;$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName;$(QTDIR)\..\qtmultimedia\include\QtMultimedia;$(QTDIR)\..\qtmultimedia\include;$(QTDIR)\..\qttools\include;$(QTDIR)\..\qttools\include\QtHelp;$(QTDIR)\include\QtConcurrent;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtOpenGL;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtXml;.\GeneratedFiles;$(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\Fractorium;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\openexr\output\include\Imath;$(ProjectDir)..\..\..\..\openexr\output\include\OpenEXR;$(ProjectDir)..\..\..\Builds\include\CLs\CL3.0;.\GeneratedFiles\$(ConfigurationName);%(AdditionalIncludeDirectories)
ProgramDatabase
MultiThreadedDLL
true
diff --git a/Builds/QtCreator/defaults.pri b/Builds/QtCreator/defaults.pri
index dc1fcf6..8a9af96 100644
--- a/Builds/QtCreator/defaults.pri
+++ b/Builds/QtCreator/defaults.pri
@@ -72,9 +72,9 @@ unix:!macx {
INCLUDEPATH += /usr/include/libxml2
}
else {
- INCLUDEPATH += /usr/local/opt/ilmbase/include/OpenEXR
- INCLUDEPATH += /usr/local/opt/openexr@2/include
- INCLUDEPATH += /usr/local/opt/jpeg/include
+ INCLUDEPATH += /usr/local/opt/ilmbase/include/OpenEXR
+ INCLUDEPATH += /usr/local/opt/openexr@2/include
+ INCLUDEPATH += /usr/local/opt/jpeg/include
}
#libjpeg and libpng aren't in separate folders, so nothing to add here for them.
@@ -84,18 +84,18 @@ else {
# Ember doesn't need OpenCL. But just place them all here in the common file for ease of maintenance.
# Unneeded libs will just be ignored.
win32 {
- LIBS = ""
- LIBS += OpenGL32.lib
- LIBS += WS2_32.lib
- LIBS += $$(OCL_ROOT)/lib/x86_64/OpenCL.lib
- LIBS += $$absolute_path($$EXTERNAL_LIB)/libjpeg.lib
- LIBS += $$absolute_path($$EXTERNAL_LIB)/libpng.lib
- LIBS += $$absolute_path($$EXTERNAL_LIB)/libxml2.lib
- LIBS += $$absolute_path($$EXTERNAL_LIB)/zlib.lib
- LIBS += $$absolute_path($$EXTERNAL_LIB)/Iex-3_1.lib
- LIBS += $$absolute_path($$EXTERNAL_LIB)/IlmThread-3_1.lib
- LIBS += $$absolute_path($$EXTERNAL_LIB)/Imath-3_1.lib
- LIBS += $$absolute_path($$EXTERNAL_LIB)/OpenEXR-3_1.lib
+ LIBS = ""
+ LIBS += OpenGL32.lib
+ LIBS += WS2_32.lib
+ LIBS += $$(OCL_ROOT)/lib/x86_64/OpenCL.lib
+ LIBS += $$absolute_path($$EXTERNAL_LIB)/libjpeg.lib
+ LIBS += $$absolute_path($$EXTERNAL_LIB)/libpng.lib
+ LIBS += $$absolute_path($$EXTERNAL_LIB)/libxml2.lib
+ LIBS += $$absolute_path($$EXTERNAL_LIB)/zlib.lib
+ LIBS += $$absolute_path($$EXTERNAL_LIB)/Iex-3_1.lib
+ LIBS += $$absolute_path($$EXTERNAL_LIB)/IlmThread-3_1.lib
+ LIBS += $$absolute_path($$EXTERNAL_LIB)/Imath-3_1.lib
+ LIBS += $$absolute_path($$EXTERNAL_LIB)/OpenEXR-3_1.lib
}
!win32 {
@@ -106,16 +106,16 @@ win32 {
LIBS += -lHalf
LIBS += -lImath
LIBS += -lIex
- LIBS += -lxml2
+ LIBS += -lxml2
}
macx {
- LIBS += -framework OpenGL
- LIBS += -framework OpenCL
- LIBS += -L/usr/local/lib# homebrew installs into /usr/local
- LIBS += -L/usr/local/opt/jpeg/lib
- LIBS += -L/usr/local/opt/openexr@2/lib
- LIBS += -L/usr/local/opt/ilmbase/lib
+ LIBS += -framework OpenGL
+ LIBS += -framework OpenCL
+ LIBS += -L/usr/local/lib# homebrew installs into /usr/local
+ LIBS += -L/usr/local/opt/jpeg/lib
+ LIBS += -L/usr/local/opt/openexr@2/lib
+ LIBS += -L/usr/local/opt/ilmbase/lib
}
unix:!macx {
@@ -227,10 +227,10 @@ win32 {
}
macx {
- QMAKE_MAC_SDK = macosx12.1
- QMAKE_MACOSX_DEPLOYMENT_TARGET = 11.0
- QMAKE_CXXFLAGS += -mmacosx-version-min=11.0 -arch x86_64
- QMAKE_CXXFLAGS += -stdlib=libc++
+ QMAKE_MAC_SDK = macosx12.1
+ QMAKE_MACOSX_DEPLOYMENT_TARGET = 11.0
+ QMAKE_CXXFLAGS += -mmacosx-version-min=11.0 -arch x86_64
+ QMAKE_CXXFLAGS += -stdlib=libc++
}
unix {
diff --git a/Source/EmberCL/EmberCLPch.h b/Source/EmberCL/EmberCLPch.h
index b750409..cdcf849 100755
--- a/Source/EmberCL/EmberCLPch.h
+++ b/Source/EmberCL/EmberCLPch.h
@@ -14,8 +14,8 @@
//This is counterintuitive, and lends further weight to the idea that OpenCL on Mac
//is horribly broken.
#ifdef __APPLE__
- #define KNL_USE_GLOBAL_CONSEC
- #define OCL_USE_1_2_V
+ #define KNL_USE_GLOBAL_CONSEC
+ #define OCL_USE_1_2_V
#endif
#define NOMINMAX
@@ -27,9 +27,9 @@
//it causes errors when compiling opencl.hpp. This happens even though it's using MSVC under the hood
//and it compiles in MSVC when using Visual Studio.
#ifndef OCL_USE_1_2_V
- #define CL_TARGET_OPENCL_VERSION 300
- #define CL_HPP_TARGET_OPENCL_VERSION 300
- #define CL_HPP_MINIMUM_OPENCL_VERSION 300
+ #define CL_TARGET_OPENCL_VERSION 300
+ #define CL_HPP_TARGET_OPENCL_VERSION 300
+ #define CL_HPP_MINIMUM_OPENCL_VERSION 300
#endif
#include "Timing.h"
@@ -48,9 +48,9 @@
#include
#ifdef OCL_USE_1_2_V
- #include
+ #include
#else
- #include
+ #include
#endif
#include
#include
diff --git a/Source/EmberCL/OpenCLWrapper.cpp b/Source/EmberCL/OpenCLWrapper.cpp
index 72bd7bd..f84655c 100644
--- a/Source/EmberCL/OpenCLWrapper.cpp
+++ b/Source/EmberCL/OpenCLWrapper.cpp
@@ -466,11 +466,11 @@ bool OpenCLWrapper::WriteImage2D(size_t index, bool shared, ::size_t width, ::si
if (m_Init)
{
cl_int err;
- cl::Event e;
+ cl::Event e;
#ifdef OCL_USE_1_2_V
- cl::size_t<3> origin, region;
+ cl::size_t<3> origin, region;
#else
- cl::array origin, region;
+ cl::array origin, region;
#endif
origin[0] = 0;
origin[1] = 0;
@@ -544,9 +544,9 @@ bool OpenCLWrapper::ReadImage(size_t imageIndex, ::size_t width, ::size_t height
cl_int err;
cl::Event e;
#ifdef OCL_USE_1_2_V
- cl::size_t<3> origin, region;
+ cl::size_t<3> origin, region;
#else
- cl::array origin, region;
+ cl::array origin, region;
#endif
origin[0] = 0;
origin[1] = 0;
@@ -808,9 +808,9 @@ bool OpenCLWrapper::EnqueueReleaseGLObjects(cl::ImageGL& image)
/// The memory objects to acquire
/// True if success, else false.
#ifdef OCL_USE_1_2_V
-bool OpenCLWrapper::EnqueueAcquireGLObjects(const VECTOR_CLASS* memObjects)
+ bool OpenCLWrapper::EnqueueAcquireGLObjects(const VECTOR_CLASS* memObjects)
#else
-bool OpenCLWrapper::EnqueueAcquireGLObjects(const cl::vector* memObjects)
+ bool OpenCLWrapper::EnqueueAcquireGLObjects(const cl::vector* memObjects)
#endif
{
if (m_Init && m_Shared)
@@ -829,9 +829,9 @@ bool OpenCLWrapper::EnqueueAcquireGLObjects(const cl::vector* memObj
/// The memory objects to release
/// True if success, else false.
#ifdef OCL_USE_1_2_V
-bool OpenCLWrapper::EnqueueReleaseGLObjects(const VECTOR_CLASS* memObjects)
+ bool OpenCLWrapper::EnqueueReleaseGLObjects(const VECTOR_CLASS* memObjects)
#else
-bool OpenCLWrapper::EnqueueReleaseGLObjects(const cl::vector* memObjects)
+ bool OpenCLWrapper::EnqueueReleaseGLObjects(const cl::vector* memObjects)
#endif
{
if (m_Init && m_Shared)
@@ -1073,13 +1073,13 @@ bool OpenCLWrapper::CreateSPK(const string& name, const string& program, const s
{
cl_int err;
#ifndef OCL_USE_1_2_V
- vector programvec{ program };
+ vector programvec { program };
#endif
- spk.m_Name = name;
+ spk.m_Name = name;
#ifdef OCL_USE_1_2_V
- spk.m_Source = cl::Program::Sources(1, std::make_pair(program.c_str(), program.length() + 1));
+ spk.m_Source = cl::Program::Sources(1, std::make_pair(program.c_str(), program.length() + 1));
#else
- spk.m_Source = cl::Program::Sources(programvec);
+ spk.m_Source = cl::Program::Sources(programvec);
#endif
spk.m_Program = cl::Program(m_Context, spk.m_Source);
diff --git a/Source/EmberCL/OpenCLWrapper.h b/Source/EmberCL/OpenCLWrapper.h
index c916e40..2a2842e 100644
--- a/Source/EmberCL/OpenCLWrapper.h
+++ b/Source/EmberCL/OpenCLWrapper.h
@@ -134,13 +134,13 @@ public:
bool EnqueueReleaseGLObjects(const string& name);
bool EnqueueReleaseGLObjects(cl::ImageGL& image);
#ifdef OCL_USE_1_2_V
- bool EnqueueAcquireGLObjects(const VECTOR_CLASS* memObjects = nullptr);
- bool EnqueueReleaseGLObjects(const VECTOR_CLASS* memObjects = nullptr);
+ bool EnqueueAcquireGLObjects(const VECTOR_CLASS* memObjects = nullptr);
+ bool EnqueueReleaseGLObjects(const VECTOR_CLASS* memObjects = nullptr);
#else
- bool EnqueueAcquireGLObjects(const cl::vector* memObjects = nullptr);
- bool EnqueueReleaseGLObjects(const cl::vector* memObjects = nullptr);
+ bool EnqueueAcquireGLObjects(const cl::vector* memObjects = nullptr);
+ bool EnqueueReleaseGLObjects(const cl::vector* memObjects = nullptr);
#endif
- bool CreateSampler(cl::Sampler& sampler, cl_bool normalizedCoords, cl_addressing_mode addressingMode, cl_filter_mode filterMode);
+ bool CreateSampler(cl::Sampler& sampler, cl_bool normalizedCoords, cl_addressing_mode addressingMode, cl_filter_mode filterMode);
//Arguments.
bool SetBufferArg(size_t kernelIndex, cl_uint argIndex, const string& name);