From 2b9496ecdf77447a660ad848a0d295f4ee9f035b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?= Date: Tue, 12 Mar 2019 17:05:39 -0700 Subject: [PATCH] Cleanup. --- scripts/example-common.lua | 14 +++++++++++--- scripts/shaderc.lua | 6 +++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/scripts/example-common.lua b/scripts/example-common.lua index c81e6b190..40b91c83b 100644 --- a/scripts/example-common.lua +++ b/scripts/example-common.lua @@ -37,11 +37,19 @@ project ("example-common") path.join(BGFX_DIR, "examples/common/**.h"), } - if filesexist(BGFX_DIR, path.join(BGFX_DIR, "../bgfx-ext"), - { path.join(BGFX_DIR, "../bgfx-ext/examples/common/entry/entry_orbis.cpp") }) then + if filesexist(BGFX_DIR, path.join(BGFX_DIR, "../bgfx-gnm"), + { path.join(BGFX_DIR, "../bgfx-gnm/examples/common/entry/entry_orbis.cpp") }) then files { - path.join(BGFX_DIR, "../bgfx-ext/examples/common/entry/entry_orbis.cpp"), + path.join(BGFX_DIR, "../bgfx-gnm/examples/common/entry/entry_orbis.cpp"), + } + end + + if filesexist(BGFX_DIR, path.join(BGFX_DIR, "../bgfx-nvn"), + { path.join(BGFX_DIR, "../bgfx-gnm/examples/common/entry/entry_nx.cpp") }) then + + files { + path.join(BGFX_DIR, "../bgfx-gnm/examples/common/entry/entry_nx.cpp"), } end diff --git a/scripts/shaderc.lua b/scripts/shaderc.lua index b7ec118bc..b0044453e 100644 --- a/scripts/shaderc.lua +++ b/scripts/shaderc.lua @@ -655,10 +655,10 @@ project "shaderc" configuration {} - if filesexist(BGFX_DIR, path.join(BGFX_DIR, "../bgfx-ext"), { + if filesexist(BGFX_DIR, path.join(BGFX_DIR, "../bgfx-gnm"), { path.join(BGFX_DIR, "scripts/shaderc.lua"), }) then - if filesexist(BGFX_DIR, path.join(BGFX_DIR, "../bgfx-ext"), { + if filesexist(BGFX_DIR, path.join(BGFX_DIR, "../bgfx-gnm"), { path.join(BGFX_DIR, "tools/shaderc/shaderc_pssl.cpp"), }) then removefiles { @@ -666,7 +666,7 @@ project "shaderc" } end - dofile(path.join(BGFX_DIR, "../bgfx-ext/scripts/shaderc.lua") ) + dofile(path.join(BGFX_DIR, "../bgfx-gnm/scripts/shaderc.lua") ) end strip()