diff options
author | 2019-10-13 13:50:38 +0200 | |
---|---|---|
committer | 2019-10-13 07:50:38 -0400 | |
commit | 0837e7451a84f95c29dbdb9bd6b8b931fee1635d (patch) | |
tree | 626bcbd250a7fbebdf5958a288d2f438d4f9fb5a /scripts/genie.lua | |
parent | c913ccb59d713ce0b91135520719ac5385e54358 (diff) |
WIP: sync bgfx, bx and bimg with latest upstream (#5723)
* Sync with bgfx upstream revision b91d0b6
* Sync with bx upstream revision d60912b
* Sync with bimg upstream revision bd81f60
* Add astc-codec decoder
* Rename VertexDecl to VertexLayout
* Rename UniformType enum Int1 to Sampler.
* Add NVN stub
* Fix unused-const-variable error on macOS
* Drop redundant explicit language parameters
buildoptions_cpp are only applied to c++ files and buildoptions_objcpp are only
applied to objective c++ files. As such, hardcoding -x offers no benefit while
preventing overrides (such as one needed by 3rdparty/bgfx/src/renderer_vk.cpp on
macOS) from working.
* Re-introduce -x c++ in places where C code is compiled as C++ to prevent clang from throwing a warning
* Build bgfx as Objective-C++ on macOS
It is needed due to included headers
* Enable Direct3D12 and Vulkan bgfx rendering backends
* Enable building of spirv shaders
* Properly escape /c in cmd call
* Comment out dx12 bgfx renderer
* Honor VERBOSE setting during shaders build
* Only invert hlsl shader XYZ_TO_sRGB matrix for opengl
* Add spirv shaders
* OpenGL ES needs transposed matrix too
* Metal needs transposed matrix as well
Diffstat (limited to 'scripts/genie.lua')
-rw-r--r-- | scripts/genie.lua | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua index d90b98adf49..94ddbffe257 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -769,22 +769,18 @@ end local version = str_to_version(_OPTIONS["gcc_version"]) if string.find(_OPTIONS["gcc"], "clang") and ((version < 30500) or (_OPTIONS["targetos"]=="macosx" and (version <= 60000))) then buildoptions_cpp { - "-x c++", "-std=c++1y", } buildoptions_objcpp { - "-x objective-c++", "-std=c++1y", } else buildoptions_cpp { - "-x c++", "-std=c++14", } buildoptions_objcpp { - "-x objective-c++", "-std=c++14", } end @@ -1178,7 +1174,6 @@ configuration { "asmjs" } "-s USE_SDL_TTF=2", } buildoptions_cpp { - "-x c++", "-std=c++14", } linkoptions { @@ -1194,7 +1189,6 @@ configuration { "android*" } "-Wno-incompatible-ms-struct", } buildoptions_cpp { - "-x c++", "-std=c++14", "-Wno-extern-c-compat", "-Wno-tautological-constant-out-of-range-compare", @@ -1213,7 +1207,6 @@ configuration { "pnacl" } "-Wno-inline-new-delete", } buildoptions_cpp { - "-x c++", "-std=c++14", } archivesplit_size "20" |