Merge pull request #167 from gboisse/master

Faster BVH

Author: yozhijk

Calc/Calc.lua

@@ -30,7 +30,9 @@ project "Calc"
     includedirs { ".", "./inc", "../CLW" }
     files { "../Calc/**.h", "../Calc/**.cpp"}
 
-	links {"CLW"}
+	if _OPTIONS["use_opencl"] then
+		links {"CLW"}
+	end
 
     configuration {"x32", "Debug"}
         targetdir "../../Bin/Debug/x86"

RadeonRays/RadeonRays.lua

@@ -71,7 +71,7 @@ project "RadeonRays"
 
         if _OPTIONS["use_vulkan"] then
             os.execute( "python ../Tools/scripts/stringify.py " ..
-                                os.getcwd() .. "../RadeonRays/src/kernels/GLSL/ "  ..
+                                os.getcwd() .. "./../RadeonRays/src/kernels/GLSL/ "  ..
                                 ".comp " ..
                                 "vulkan " ..
                                  "> ./src/kernelcache/kernels_vk.h"
@@ -128,9 +128,9 @@ project "RadeonRays"
         end
         if vulkanSDKPath ~= nil then
             configuration {"x32"}
-            libdirs { vulkanSDKPath .. "/Bin32" }
+            libdirs { vulkanSDKPath .. "/Lib32" }
             configuration {"x64"}
-            libdirs { vulkanSDKPath .. "/Bin" }
+            libdirs { vulkanSDKPath .. "/Lib" }
             configuration {}
         end
         if os.is("macosx") then