diff options
author | 2023-01-04 23:29:18 -0500 | |
---|---|---|
committer | 2023-01-04 23:29:18 -0500 | |
commit | 94b1e168b2b97b48b81f7a8f64406b0a6f64184e (patch) | |
tree | f57362a0fa01bfe8f0ad75a447c4c9e10bc15756 /3rdparty/bx/scripts/bx.lua | |
parent | 5581eaa50a42256242f32569f59ce10d70ddd8c2 (diff) |
Revert "Update BGFX, BX and BIMG (#10750)" (#10787)
This reverts commit 5581eaa50a42256242f32569f59ce10d70ddd8c2 due to link failure on macOS.
Diffstat (limited to '3rdparty/bx/scripts/bx.lua')
-rw-r--r-- | 3rdparty/bx/scripts/bx.lua | 42 |
1 files changed, 7 insertions, 35 deletions
diff --git a/3rdparty/bx/scripts/bx.lua b/3rdparty/bx/scripts/bx.lua index 1bb5dc43d4b..1e54ac521fc 100644 --- a/3rdparty/bx/scripts/bx.lua +++ b/3rdparty/bx/scripts/bx.lua @@ -1,6 +1,6 @@ -- --- Copyright 2010-2022 Branimir Karadzic. All rights reserved. --- License: https://github.com/bkaradzic/bx/blob/master/LICENSE +-- Copyright 2010-2021 Branimir Karadzic. All rights reserved. +-- License: https://github.com/bkaradzic/bx#license-bsd-2-clause -- local function userdefines() @@ -15,28 +15,6 @@ local function userdefines() return defines end -function using_bx() - includedirs { - path.join(BX_DIR, "include"), - } - - links { - "bx", - } - - configuration { "Debug" } - defines { - "BX_CONFIG_DEBUG=1", - } - - configuration { "Release" } - defines { - "BX_CONFIG_DEBUG=0", - } - - configuration {} -end - project "bx" kind "StaticLib" @@ -54,6 +32,11 @@ project "bx" defines (userdefines()) + configuration { "Debug" } + defines { + "BX_CONFIG_DEBUG=1", + } + configuration { "linux-*" } buildoptions { "-fPIC", @@ -64,7 +47,6 @@ project "bx" if _OPTIONS["with-amalgamated"] then excludes { path.join(BX_DIR, "src/allocator.cpp"), - path.join(BX_DIR, "src/bounds.cpp"), path.join(BX_DIR, "src/bx.cpp"), path.join(BX_DIR, "src/commandline.cpp"), path.join(BX_DIR, "src/crtnone.cpp"), @@ -92,14 +74,4 @@ project "bx" } end - configuration { "Debug" } - defines { - "BX_CONFIG_DEBUG=1", - } - - configuration { "Release" } - defines { - "BX_CONFIG_DEBUG=0", - } - configuration {} |