Browse Source

Fixed Linux build.

Branimir Karadžić 10 years ago
parent
commit
a39ba04e26
2 changed files with 10 additions and 2 deletions
  1. 6 2
      scripts/bgfx.lua
  2. 4 0
      src/bgfx.cpp

+ 6 - 2
scripts/bgfx.lua

@@ -144,6 +144,9 @@ function bgfxProject(_name, _kind, _defines)
 					path.join(BGFX_DIR, "src/renderer_mtl.mm"),
 					path.join(BGFX_DIR, "src/renderer_mtl.mm"),
 					path.join(BGFX_DIR, "src/amalgamated.cpp"),
 					path.join(BGFX_DIR, "src/amalgamated.cpp"),
 				}
 				}
+
+			configuration {}
+
 		else
 		else
 			configuration { "xcode4 or osx or ios*" }
 			configuration { "xcode4 or osx or ios*" }
 				files {
 				files {
@@ -152,9 +155,10 @@ function bgfxProject(_name, _kind, _defines)
 					path.join(BGFX_DIR, "src/renderer_mtl.mm"),
 					path.join(BGFX_DIR, "src/renderer_mtl.mm"),
 				}
 				}
 
 
+			configuration {}
+
 			excludes {
 			excludes {
-				path.join(BGFX_DIR, "src/amalgamated.mm"),
-				path.join(BGFX_DIR, "src/amalgamated.cpp"),
+				path.join(BGFX_DIR, "src/amalgamated.**"),
 			}
 			}
 		end
 		end
 
 

+ 4 - 0
src/bgfx.cpp

@@ -1358,7 +1358,11 @@ namespace bgfx
 		{ d3d9::rendererCreate,  d3d9::rendererDestroy,  BGFX_RENDERER_DIRECT3D9_NAME,  !!BGFX_CONFIG_RENDERER_DIRECT3D9  }, // Direct3D9
 		{ d3d9::rendererCreate,  d3d9::rendererDestroy,  BGFX_RENDERER_DIRECT3D9_NAME,  !!BGFX_CONFIG_RENDERER_DIRECT3D9  }, // Direct3D9
 		{ d3d11::rendererCreate, d3d11::rendererDestroy, BGFX_RENDERER_DIRECT3D11_NAME, !!BGFX_CONFIG_RENDERER_DIRECT3D11 }, // Direct3D11
 		{ d3d11::rendererCreate, d3d11::rendererDestroy, BGFX_RENDERER_DIRECT3D11_NAME, !!BGFX_CONFIG_RENDERER_DIRECT3D11 }, // Direct3D11
 		{ d3d12::rendererCreate, d3d12::rendererDestroy, BGFX_RENDERER_DIRECT3D12_NAME, !!BGFX_CONFIG_RENDERER_DIRECT3D12 }, // Direct3D12
 		{ d3d12::rendererCreate, d3d12::rendererDestroy, BGFX_RENDERER_DIRECT3D12_NAME, !!BGFX_CONFIG_RENDERER_DIRECT3D12 }, // Direct3D12
+#if BX_PLATFORM_OSX || BX_PLATFORM_IOS
 		{ mtl::rendererCreate,   mtl::rendererDestroy,   BGFX_RENDERER_METAL_NAME,      !!BGFX_CONFIG_RENDERER_METAL      }, // Metal
 		{ mtl::rendererCreate,   mtl::rendererDestroy,   BGFX_RENDERER_METAL_NAME,      !!BGFX_CONFIG_RENDERER_METAL      }, // Metal
+#else
+		{ noop::rendererCreate,  noop::rendererDestroy,  BGFX_RENDERER_NULL_NAME,       !!BGFX_CONFIG_RENDERER_NULL       }, // Noop
+#endif // BX_PLATFORM_OSX || BX_PLATFORM_IOS
 		{ gl::rendererCreate,    gl::rendererDestroy,    BGFX_RENDERER_OPENGL_NAME,     !!BGFX_CONFIG_RENDERER_OPENGLES   }, // OpenGLES
 		{ gl::rendererCreate,    gl::rendererDestroy,    BGFX_RENDERER_OPENGL_NAME,     !!BGFX_CONFIG_RENDERER_OPENGLES   }, // OpenGLES
 		{ gl::rendererCreate,    gl::rendererDestroy,    BGFX_RENDERER_OPENGL_NAME,     !!BGFX_CONFIG_RENDERER_OPENGL     }, // OpenGL
 		{ gl::rendererCreate,    gl::rendererDestroy,    BGFX_RENDERER_OPENGL_NAME,     !!BGFX_CONFIG_RENDERER_OPENGL     }, // OpenGL
 		{ vk::rendererCreate,    vk::rendererDestroy,    BGFX_RENDERER_VULKAN_NAME,     !!BGFX_CONFIG_RENDERER_VULKAN     }, // Vulkan
 		{ vk::rendererCreate,    vk::rendererDestroy,    BGFX_RENDERER_VULKAN_NAME,     !!BGFX_CONFIG_RENDERER_VULKAN     }, // Vulkan