Merge pull request #645 from jb55/modular-build-patch

Configurable genie, bx location
This commit is contained in:
Branimir Karadžić 2016-01-09 19:00:07 -08:00
commit 89a8617ac8
2 changed files with 6 additions and 2 deletions

View File

@ -20,7 +20,7 @@ endif
# $(info $(OS))
GENIE=../bx/tools/bin/$(OS)/genie $(GENIE_FLAGS)
GENIE ?= ../bx/tools/bin/$(OS)/genie $(GENIE_FLAGS)
all:
$(GENIE) --with-tools --with-shared-lib vs2008

View File

@ -66,9 +66,13 @@ solution "bgfx"
startproject "example-00-helloworld"
BGFX_DIR = path.getabsolute("..")
BX_DIR = os.getenv("BX_DIR")
local BGFX_BUILD_DIR = path.join(BGFX_DIR, ".build")
local BGFX_THIRD_PARTY_DIR = path.join(BGFX_DIR, "3rdparty")
BX_DIR = path.getabsolute(path.join(BGFX_DIR, "../bx"))
if not BX_DIR then
BX_DIR = path.getabsolute(path.join(BGFX_DIR, "../bx"))
end
if not os.isdir(BX_DIR) then
print("bx not found at " .. BX_DIR)