Fix embed kernels option on OSX

Author: yozhijk

CLW/CLWParallelPrimitives.cpp

@@ -30,7 +30,7 @@ THE SOFTWARE.
 
 #ifdef RR_EMBED_KERNELS
 #if USE_OPENCL
-#    include <CLW/kernelcache/clwkernels_cl.h>
+#include "CLW/kernelcache/clwkernels_cl.h"
 #endif
 #endif // RR_EMBED_KERNELS
 
@@ -952,4 +952,4 @@ CLWEvent CLWParallelPrimitives::Copy(unsigned int deviceIdx, CLWBuffer<cl_int> i
     copyKernel.SetArg(2, output);
 
     return context_.Launch1D(0, NUM_BLOCKS * WG_SIZE, WG_SIZE, copyKernel);
-}
+}

Calc/src/device_clw.cpp

@@ -459,9 +459,6 @@ namespace Calc
                 ""
 #endif
                 );
-#ifdef USE_SAFE_MATH
-            buildopts.append("-D USE_SAFE_MATH");
-#endif
 
             return new ExecutableClw(
                                      CLWProgram::CreateFromFile(filename, headernames, numheaders, buildopts.c_str(), m_context)

RadeonRays/RadeonRays.lua

@@ -108,8 +108,13 @@ project "RadeonRays"
     end
 
     if _OPTIONS["enable_raymask"] then
-       	configuration {}
-	defines {"RR_RAY_MASK"}
+        configuration {}
+        defines {"RR_RAY_MASK"}
+    end
+
+    if _OPTIONS["safe_math"] then
+        configuration {}
+        defines { "USE_SAFE_MATH" }
     end
 
     if _OPTIONS["use_vulkan"] then

RadeonRays/src/intersector/intersector_2level.cpp

@@ -130,10 +130,14 @@ namespace RadeonRays
     {
         std::string buildopts =
 #ifdef RR_RAY_MASK
-            "-D RR_RAY_MASK";
+            "-D RR_RAY_MASK ";
 #else
             "";
 #endif
+        
+#ifdef USE_SAFE_MATH
+        buildopts.append("-D USE_SAFE_MATH ");
+#endif
 
 #ifndef RR_EMBED_KERNELS
         if ( device->GetPlatform() == Calc::Platform::kOpenCL )

RadeonRays/src/intersector/intersector_bittrail.cpp

@@ -90,10 +90,14 @@ namespace RadeonRays
     {
         std::string buildopts =
 #ifdef RR_RAY_MASK
-            "-D RR_RAY_MASK";
+            "-D RR_RAY_MASK ";
 #else
             "";
 #endif
+        
+#ifdef USE_SAFE_MATH
+        buildopts.append("-D USE_SAFE_MATH ");
+#endif
 
 #ifndef RR_EMBED_KERNELS
         if (device->GetPlatform() == Calc::Platform::kOpenCL)

RadeonRays/src/intersector/intersector_hlbvh.cpp

@@ -79,10 +79,14 @@ namespace RadeonRays
     {
         std::string buildopts =
 #ifdef RR_RAY_MASK
-            "-D RR_RAY_MASK";
+            "-D RR_RAY_MASK ";
 #else
             "";
 #endif
+        
+#ifdef USE_SAFE_MATH
+        buildopts.append("-D USE_SAFE_MATH ");
+#endif
 
 #ifndef RR_EMBED_KERNELS
         if ( device->GetPlatform() == Calc::Platform::kOpenCL )

RadeonRays/src/intersector/intersector_short_stack.cpp

@@ -85,10 +85,14 @@ namespace RadeonRays
     {
         std::string buildopts =
 #ifdef RR_RAY_MASK
-            "-D RR_RAY_MASK";
+            "-D RR_RAY_MASK ";
 #else
             "";
 #endif
+        
+#ifdef USE_SAFE_MATH
+        buildopts.append("-D USE_SAFE_MATH ");
+#endif
 
 #ifndef RR_EMBED_KERNELS
         if (device->GetPlatform() == Calc::Platform::kOpenCL)

RadeonRays/src/intersector/intersector_skip_links.cpp

@@ -83,11 +83,15 @@ namespace RadeonRays
     {
         std::string buildopts =
 #ifdef RR_RAY_MASK
-            "-D RR_RAY_MASK";
+            "-D RR_RAY_MASK ";
 #else
             "";
 #endif
 
+#ifdef USE_SAFE_MATH
+        buildopts.append("-D USE_SAFE_MATH ");
+#endif
+        
 #ifndef RR_EMBED_KERNELS
         if ( device->GetPlatform() == Calc::Platform::kOpenCL )
         {