summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/scripts/bgfx.lua
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/bgfx/scripts/bgfx.lua')
-rw-r--r--3rdparty/bgfx/scripts/bgfx.lua57
1 files changed, 34 insertions, 23 deletions
diff --git a/3rdparty/bgfx/scripts/bgfx.lua b/3rdparty/bgfx/scripts/bgfx.lua
index 693b7a3c6c2..c9658d35f84 100644
--- a/3rdparty/bgfx/scripts/bgfx.lua
+++ b/3rdparty/bgfx/scripts/bgfx.lua
@@ -35,6 +35,7 @@ function bgfxProject(_name, _kind, _defines)
includedirs {
path.join(BGFX_DIR, "3rdparty"),
+ path.join(BGFX_DIR, "3rdparty/dxsdk/include"),
path.join(BGFX_DIR, "../bx/include"),
}
@@ -57,14 +58,6 @@ function bgfxProject(_name, _kind, _defines)
}
end
- if (_OPTIONS["vs"] == "vs2012-xp")
- or (_OPTIONS["vs"] == "vs2013-xp") then
- configuration { "vs201*" }
- includedirs {
- "$(DXSDK_DIR)/include",
- }
- end
-
configuration { "Debug" }
defines {
"BGFX_CONFIG_DEBUG=1",
@@ -76,19 +69,15 @@ function bgfxProject(_name, _kind, _defines)
"GLESv2",
}
- configuration { "vs2008" }
- includedirs {
- "$(DXSDK_DIR)/include",
- }
-
- configuration { "winphone8* or winstore8*"}
+ configuration { "winphone8* or winstore8*" }
linkoptions {
"/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
}
- configuration { "xcode4 or osx or ios*" }
- files {
- path.join(BGFX_DIR, "src/**.mm"),
+ configuration { "*clang*" }
+ buildoptions {
+ "-Wno-microsoft-enum-value", -- enumerator value is not representable in the underlying type 'int'
+ "-Wno-microsoft-const-init", -- default initialization of an object of const type '' without a user-provided default constructor is a Microsoft extension
}
configuration { "osx" }
@@ -102,11 +91,6 @@ function bgfxProject(_name, _kind, _defines)
path.join(BGFX_DIR, "3rdparty/khronos"),
}
- configuration { "x64", "vs* or mingw*" }
- defines {
- "_WIN32_WINNT=0x601",
- }
-
configuration {}
includedirs {
@@ -139,11 +123,38 @@ function bgfxProject(_name, _kind, _defines)
path.join(BGFX_DIR, "src/renderer_null.cpp"),
path.join(BGFX_DIR, "src/renderer_gl.cpp"),
path.join(BGFX_DIR, "src/renderer_vk.cpp"),
+ path.join(BGFX_DIR, "src/shader_dx9bc.cpp"),
+ path.join(BGFX_DIR, "src/shader_dxbc.cpp"),
+ path.join(BGFX_DIR, "src/shader_spirv.cpp"),
path.join(BGFX_DIR, "src/vertexdecl.cpp"),
}
+
+ configuration { "xcode4 or osx or ios*" }
+ files {
+ path.join(BGFX_DIR, "src/amalgamated.mm"),
+ }
+
+ excludes {
+ path.join(BGFX_DIR, "src/glcontext_eagl.mm"),
+ path.join(BGFX_DIR, "src/glcontext_nsgl.mm"),
+ path.join(BGFX_DIR, "src/renderer_mtl.mm"),
+ path.join(BGFX_DIR, "src/amalgamated.cpp"),
+ }
+
+ configuration {}
+
else
+ configuration { "xcode4 or osx or ios*" }
+ files {
+ path.join(BGFX_DIR, "src/glcontext_eagl.mm"),
+ path.join(BGFX_DIR, "src/glcontext_nsgl.mm"),
+ path.join(BGFX_DIR, "src/renderer_mtl.mm"),
+ }
+
+ configuration {}
+
excludes {
- path.join(BGFX_DIR, "src/amalgamated.cpp"),
+ path.join(BGFX_DIR, "src/amalgamated.**"),
}
end