diff options
author | 2023-01-04 23:29:18 -0500 | |
---|---|---|
committer | 2023-01-04 23:29:18 -0500 | |
commit | 94b1e168b2b97b48b81f7a8f64406b0a6f64184e (patch) | |
tree | f57362a0fa01bfe8f0ad75a447c4c9e10bc15756 /3rdparty/bgfx/scripts/example-common.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/bgfx/scripts/example-common.lua')
-rw-r--r-- | 3rdparty/bgfx/scripts/example-common.lua | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/3rdparty/bgfx/scripts/example-common.lua b/3rdparty/bgfx/scripts/example-common.lua index c6ddb81fd6c..6a1101a3edd 100644 --- a/3rdparty/bgfx/scripts/example-common.lua +++ b/3rdparty/bgfx/scripts/example-common.lua @@ -1,12 +1,13 @@ -- --- Copyright 2010-2022 Branimir Karadzic. All rights reserved. --- License: https://github.com/bkaradzic/bgfx/blob/master/LICENSE +-- Copyright 2010-2021 Branimir Karadzic. All rights reserved. +-- License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause -- project ("example-glue") kind "StaticLib" includedirs { + path.join(BX_DIR, "include"), path.join(BIMG_DIR, "include"), path.join(BGFX_DIR, "include"), path.join(BGFX_DIR, "3rdparty"), @@ -16,14 +17,11 @@ project ("example-glue") path.join(BGFX_DIR, "examples/common/example-glue.cpp"), } - using_bx() - - configuration {} - project ("example-common") kind "StaticLib" includedirs { + path.join(BX_DIR, "include"), path.join(BIMG_DIR, "include"), path.join(BGFX_DIR, "include"), path.join(BGFX_DIR, "3rdparty"), @@ -38,8 +36,6 @@ project ("example-common") path.join(BGFX_DIR, "examples/common/**.h"), } - using_bx() - if filesexist(BGFX_DIR, path.join(BGFX_DIR, "../bgfx-gnm"), { path.join(BGFX_DIR, "../bgfx-gnm/examples/common/entry/entry_orbis.cpp") }) then @@ -81,11 +77,6 @@ project ("example-common") } end - configuration { "android-*" } - includedirs { - path.join(BGFX_DIR, "3rdparty/native_app_glue") - } - configuration { "osx* or ios* or tvos*" } files { path.join(BGFX_DIR, "examples/common/**.mm"), @@ -99,5 +90,3 @@ project ("example-common") "/ignore:4264" -- LNK4264: archiving object file compiled with /ZW into a static library; note that when authoring Windows Runtime types it is not recommended to link with a static library that contains Windows Runtime metadata } premake.vstudio.splashpath = "../../../examples/runtime/images/SplashScreen.png" - - configuration {} |