Updated build system to now download and include glm library
This commit is contained in:
@@ -5,6 +5,7 @@ local output_name = "basalt.lib"
|
|||||||
local include_dirs = "-I\"" .. table.concat({
|
local include_dirs = "-I\"" .. table.concat({
|
||||||
"include",
|
"include",
|
||||||
"thirdparty/glfw/include",
|
"thirdparty/glfw/include",
|
||||||
|
"thirdparty/glm",
|
||||||
vulkan_sdk_dir .. "/Include",
|
vulkan_sdk_dir .. "/Include",
|
||||||
vulkan_sdk_dir .. "/Include/vulkan",
|
vulkan_sdk_dir .. "/Include/vulkan",
|
||||||
}, "\" -I\"") .. '\"'
|
}, "\" -I\"") .. '\"'
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
local function download_requirements()
|
local function download_requirements()
|
||||||
-- Git module is not yet implemented, so delegate to the command-line
|
-- Git module is not yet implemented, so delegate to the command-line
|
||||||
local argv = {
|
local argv = {
|
||||||
{"clone https://github.com/glfw/glfw.git thirdparty/glfw"}
|
{"clone https://github.com/glfw/glfw.git thirdparty/glfw"},
|
||||||
|
{"clone https://github.com/g-truc/glm.git thirdparty/glm"}
|
||||||
}
|
}
|
||||||
local ec, stdout, stderr = platform.exec_parallel("git", 1, argv)
|
local ec, stdout, stderr = platform.exec_parallel("git", 1, argv)
|
||||||
for i,ec in pairs(ec) do
|
for i,ec in pairs(ec) do
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ local output_name = args[1] .. '.exe'
|
|||||||
local include_dirs = "-I\"" .. table.concat({
|
local include_dirs = "-I\"" .. table.concat({
|
||||||
"include",
|
"include",
|
||||||
"thirdparty/glfw/include",
|
"thirdparty/glfw/include",
|
||||||
|
"thirdparty/glm",
|
||||||
vulkan_sdk_dir .. "/Include",
|
vulkan_sdk_dir .. "/Include",
|
||||||
vulkan_sdk_dir .. "/Include/vulkan",
|
vulkan_sdk_dir .. "/Include/vulkan",
|
||||||
"tests/" .. args[1] .. '/include'
|
"tests/" .. args[1] .. '/include'
|
||||||
|
|||||||
Reference in New Issue
Block a user