mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #315 from mmicko/master

Browse Source 
Cleanup for MINGW builds and FIX build
This commit is contained in:
Branimir Karadžić 2015-04-01 09:18:41 -07:00
commit 6394277397
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/bgfx.lua
View File

@ -76,7 +76,7 @@ function bgfxProject(_name, _kind, _defines)
"GLESv2", "GLESv2",
} }
configuration { "mingw* or vs2008" } configuration { "vs2008" }
includedirs { includedirs {
"$(DXSDK_DIR)/include", "$(DXSDK_DIR)/include",
} }

2
scripts/example-common.lua
View File

@ -37,7 +37,7 @@ project ("example-common")
} }
end end
configuration { "mingw* or vs2008" } configuration { "vs2008" }
includedirs { includedirs {
"$(DXSDK_DIR)/include", "$(DXSDK_DIR)/include",
} }

4
scripts/shaderc.lua
View File

@ -46,11 +46,13 @@ project "shaderc"
path.join(GLSL_OPTIMIZER, "include/c99"), path.join(GLSL_OPTIMIZER, "include/c99"),
} }
configuration { "windows" } configuration { "vs*" }
includedirs { includedirs {
"$(DXSDK_DIR)/include", "$(DXSDK_DIR)/include",
} }
configuration { "windows" }
links { links {
"d3dx9", "d3dx9",
"d3dcompiler", "d3dcompiler",

2
src/renderer_d3d9.cpp
View File

@ -390,7 +390,7 @@ namespace bgfx { namespace d3d9
} }
if (BX_ENABLED(BGFX_CONFIG_DEBUG_PERFHUD) if (BX_ENABLED(BGFX_CONFIG_DEBUG_PERFHUD)
&& 0 != strstr(description, "PerfHUD")) && 0 != strstr(desc.Description, "PerfHUD"))
{ {
m_adapter = ii; m_adapter = ii;
m_deviceType = D3DDEVTYPE_REF; m_deviceType = D3DDEVTYPE_REF;

3
tools/shaderc/shaderc_dx9.cpp
View File

@ -250,6 +250,7 @@ bool compileHLSLShaderDx9(bx::CommandLine& _cmdLine, const std::string& _code, b
uint8_t nul = 0; uint8_t nul = 0;
bx::write(_writer, nul); bx::write(_writer, nul);
#if !defined(__MINGW32__)
if (_cmdLine.hasArg('\0', "disasm") ) if (_cmdLine.hasArg('\0', "disasm") )
{ {
LPD3DXBUFFER disasm; LPD3DXBUFFER disasm;
@ -268,7 +269,7 @@ bool compileHLSLShaderDx9(bx::CommandLine& _cmdLine, const std::string& _code, b
disasm->Release(); disasm->Release();
} }
} }
#endif
if (NULL != code) if (NULL != code)
{ {
code->Release(); code->Release();