Skip to content

Commit 04165d1

Browse files
authored
Merge pull request #84 from beasterio/master
linux build fix.
2 parents 25e86fe + cefa741 commit 04165d1

File tree

2 files changed

+23
-0
lines changed

2 files changed

+23
-0
lines changed

App/App.lua

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,28 @@ project "App"
3636
os.execute("rm -rf obj");
3737
end
3838

39+
if _OPTIONS["use_vulkan"] then
40+
local vulkanSDKPath = os.getenv( "VK_SDK_PATH" );
41+
if vulkanSDKPath == nil then
42+
vulkanSDKPath = os.getenv( "VULKAN_SDK" );
43+
end
44+
if vulkanSDKPath ~= nil then
45+
configuration {"x32"}
46+
libdirs { vulkanSDKPath .. "/Bin32" }
47+
configuration {"x64"}
48+
libdirs { vulkanSDKPath .. "/Bin" }
49+
configuration {}
50+
end
51+
if os.is("macosx") then
52+
--no Vulkan on macOs need to error out TODO
53+
elseif os.is("linux") then
54+
libdirs { vulkanSDKPath .. "/lib" }
55+
links { "vulkan"}
56+
elseif os.is("windows") then
57+
links {"Anvil"}
58+
links{"vulkan-1"}
59+
end
60+
end
3961
-- if _OPTIONS["embed_kernels"] then
4062
-- configuration {}
4163
-- defines {"FR_EMBED_KERNELS"}

UnitTest/utils.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include "utils.h"
22
#include "RadeonRays/src/primitive/mesh.h"
33
#include "RadeonRays/src/primitive/instance.h"
4+
#include <cfloat>
45

56
using namespace RadeonRays;
67

0 commit comments

Comments
 (0)