From 33057ea86c8c5e0126dda480c2c2aadca6a35b3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Thu, 22 Sep 2016 22:16:54 -0700 Subject: [PATCH] Fixed amalgamated build. --- scripts/bgfx.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/bgfx.lua b/scripts/bgfx.lua index abd3eaebe..b72d9da5d 100644 --- a/scripts/bgfx.lua +++ b/scripts/bgfx.lua @@ -137,7 +137,7 @@ function bgfxProject(_name, _kind, _defines) path.join(BGFX_DIR, "src/image.cpp"), path.join(BGFX_DIR, "src/hmd**.cpp"), path.join(BGFX_DIR, "src/renderer_**.cpp"), - path.join(BGFX_DIR, "src/shader_**.cpp"), + path.join(BGFX_DIR, "src/shader**.cpp"), path.join(BGFX_DIR, "src/topology.cpp"), path.join(BGFX_DIR, "src/vertexdecl.cpp"), } @@ -153,6 +153,11 @@ function bgfxProject(_name, _kind, _defines) path.join(BGFX_DIR, "src/amalgamated.cpp"), } + configuration { "not (xcode* or osx or ios*)" } + excludes { + path.join(BGFX_DIR, "src/**.mm"), + } + configuration {} else