diff --git a/pkg/ant.render/make.lua b/pkg/ant.render/make.lua index 5f6ea2617d..a69b667dde 100644 --- a/pkg/ant.render/make.lua +++ b/pkg/ant.render/make.lua @@ -2,131 +2,6 @@ local lm = require "luamake" local ROOT = "../../" -lm:build "moltenvk_rev_hdr" { - rootdir = ROOT, - "mkdir", "-p", "$builddir/tmpfile", - "&&", "rm", "-f", "$out", - "&&", "env", "BUILT_PRODUCTS_DIR=$builddir/tmpfile", "$in", - input = "3rd/MoltenVK/Scripts/gen_moltenvk_rev_hdr.sh", - output = "$builddir/tmpfile/mvkGitRevDerived.h", -} - -lm:phony { - rootdir = ROOT, - input = "$builddir/tmpfile/mvkGitRevDerived.h", - output = "3rd/MoltenVK/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm", -} - -lm:lua_source "moltenvk" { - rootdir = ROOT, - macos = { - includes = { - "3rd/MoltenVK/MoltenVK/include", - "3rd/MoltenVK/Common", - "3rd/MoltenVK/MoltenVKShaderConverter/SPIRV-Cross", - "3rd/MoltenVK/MoltenVKShaderConverter/include", - "3rd/MoltenVK/MoltenVKShaderConverter/glslang/External/spirv-tools/include", - "3rd/MoltenVK/MoltenVKShaderConverter/glslang", - "3rd/MoltenVK/MoltenVKShaderConverter", - "3rd/MoltenVK/External/cereal/include", - "3rd/MoltenVK/MoltenVK/MoltenVK/API", - "3rd/MoltenVK/MoltenVK/MoltenVK/Commands", - "3rd/MoltenVK/MoltenVK/MoltenVK/GPUObjects", - "3rd/MoltenVK/MoltenVK/MoltenVK/Layers", - "3rd/MoltenVK/MoltenVK/MoltenVK/OS", - "3rd/MoltenVK/MoltenVK/MoltenVK/Utility", - "3rd/MoltenVK/MoltenVK/MoltenVK/Vulkan", - "3rd/MoltenVK/MoltenVKShaderConverter/glslang/OGLCompilersDLL", - "$builddir/tmpfile/", - }, - defines = "MVK_EXCLUDE_SPIRV_TOOLS", - sources = { - "3rd/MoltenVK/MoltenVK/MoltenVK/Commands/*.mm", - "3rd/MoltenVK/MoltenVK/MoltenVK/GPUObjects/*.mm", - "3rd/MoltenVK/MoltenVK/MoltenVK/Layers/*.mm", - "3rd/MoltenVK/MoltenVK/MoltenVK/OS/*.mm", - "3rd/MoltenVK/MoltenVK/MoltenVK/Utility/*.m", - "3rd/MoltenVK/MoltenVK/MoltenVK/Utility/*.mm", - "3rd/MoltenVK/MoltenVK/MoltenVK/Utility/*.cpp", - "3rd/MoltenVK/MoltenVK/MoltenVK/Vulkan/*.mm", - "3rd/MoltenVK/Common/*.mm", - "3rd/MoltenVK/MoltenVKShaderConverter/SPIRV-Cross/*.cpp", - "!3rd/MoltenVK/MoltenVKShaderConverter/SPIRV-Cross/main.cpp", - "3rd/MoltenVK/MoltenVKShaderConverter/glslang/SPIRV/*.cpp", - "3rd/MoltenVK/MoltenVKShaderConverter/MoltenVKShaderConverter/*.cpp", - "3rd/MoltenVK/MoltenVKShaderConverter/MoltenVKShaderConverter/*.mm", - "3rd/MoltenVK/MoltenVKShaderConverter/glslang/glslang/MachineIndependent/*.cpp", - "3rd/MoltenVK/MoltenVKShaderConverter/glslang/glslang/MachineIndependent/preprocessor/*.cpp", - "3rd/MoltenVK/MoltenVKShaderConverter/glslang/glslang/GenericCodeGen/*.cpp", - "3rd/MoltenVK/MoltenVKShaderConverter/glslang/glslang/OSDependent/Unix/*.cpp", - "3rd/MoltenVK/MoltenVKShaderConverter/glslang/OGLCompilersDLL/*.cpp", - }, - frameworks = { - "IOSurface", - "IOKit", - "SystemConfiguration", - "QuartzCore", - "Foundation", - "Metal", - }, - }, - ios = { - flags = { - "-fno-objc-arc" - }, - includes = { - "3rd/MoltenVK/MoltenVK/include", - "3rd/MoltenVK/Common", - "3rd/MoltenVK/MoltenVKShaderConverter/SPIRV-Cross", - "3rd/MoltenVK/MoltenVKShaderConverter/include", - "3rd/MoltenVK/MoltenVKShaderConverter/glslang/External/spirv-tools/include", - "3rd/MoltenVK/MoltenVKShaderConverter/glslang", - "3rd/MoltenVK/MoltenVKShaderConverter", - "3rd/MoltenVK/External/cereal/include", - "3rd/MoltenVK/MoltenVK/MoltenVK/API", - "3rd/MoltenVK/MoltenVK/MoltenVK/Commands", - "3rd/MoltenVK/MoltenVK/MoltenVK/GPUObjects", - "3rd/MoltenVK/MoltenVK/MoltenVK/Layers", - "3rd/MoltenVK/MoltenVK/MoltenVK/OS", - "3rd/MoltenVK/MoltenVK/MoltenVK/Utility", - "3rd/MoltenVK/MoltenVK/MoltenVK/Vulkan", - "3rd/MoltenVK/MoltenVKShaderConverter/glslang/OGLCompilersDLL", - "$builddir/tmpfile/", - }, - defines = "MVK_EXCLUDE_SPIRV_TOOLS", - sources = { - "3rd/MoltenVK/MoltenVK/MoltenVK/Commands/*.mm", - "3rd/MoltenVK/MoltenVK/MoltenVK/GPUObjects/*.mm", - "3rd/MoltenVK/MoltenVK/MoltenVK/Layers/*.mm", - "3rd/MoltenVK/MoltenVK/MoltenVK/OS/*.mm", - "3rd/MoltenVK/MoltenVK/MoltenVK/Utility/*.m", - "3rd/MoltenVK/MoltenVK/MoltenVK/Utility/*.mm", - "3rd/MoltenVK/MoltenVK/MoltenVK/Utility/*.cpp", - "3rd/MoltenVK/MoltenVK/MoltenVK/Vulkan/*.mm", - "3rd/MoltenVK/Common/*.mm", - "3rd/MoltenVK/MoltenVKShaderConverter/SPIRV-Cross/*.cpp", - "!3rd/MoltenVK/MoltenVKShaderConverter/SPIRV-Cross/main.cpp", - "3rd/MoltenVK/MoltenVKShaderConverter/glslang/SPIRV/*.cpp", - "3rd/MoltenVK/MoltenVKShaderConverter/MoltenVKShaderConverter/*.cpp", - "3rd/MoltenVK/MoltenVKShaderConverter/MoltenVKShaderConverter/*.mm", - "3rd/MoltenVK/MoltenVKShaderConverter/glslang/glslang/MachineIndependent/*.cpp", - "3rd/MoltenVK/MoltenVKShaderConverter/glslang/glslang/MachineIndependent/preprocessor/*.cpp", - "3rd/MoltenVK/MoltenVKShaderConverter/glslang/glslang/GenericCodeGen/*.cpp", - "3rd/MoltenVK/MoltenVKShaderConverter/glslang/glslang/OSDependent/Unix/*.cpp", - "3rd/MoltenVK/MoltenVKShaderConverter/glslang/OGLCompilersDLL/*.cpp", - }, - frameworks = { - "IOSurface", - "SystemConfiguration", - "QuartzCore", - "Foundation", - "Metal", - "UIKit", - "CoreGraphics" - }, - }, -} - lm:lua_source "render_core"{ includes = { ROOT .. "3rd/bgfx/include", @@ -150,16 +25,6 @@ lm:lua_source "render_core"{ "render/render.cpp", "render/queue.cpp", }, - -- macos = { - -- deps = { - -- "moltenvk", - -- } - -- }, - -- ios = { - -- deps = { - -- "moltenvk", - -- } - -- } } lm:lua_source "render" {