Normalize shader source EOL to LF.

This commit is contained in:
bkaradzic 2013-02-16 23:00:57 -08:00
parent b9a0272856
commit 4494bcf6bc
2 changed files with 8 additions and 3 deletions

Binary file not shown.

View file

@ -1082,7 +1082,12 @@ struct Preprocessor
m_input = m_default; m_input = m_default;
m_input += "\n\n"; m_input += "\n\n";
m_input += _input;
size_t len = strlen(_input)+1;
char* temp = new char[len];
bx::eolLF(temp, len, _input);
m_input += temp;
delete [] temp;
fppTag* tagptr = m_tagptr; fppTag* tagptr = m_tagptr;
@ -1201,7 +1206,7 @@ uint32_t parseInOut(InOut& _inout, const char* _str, const char* _eol)
murmur.begin(); murmur.begin();
for (InOut::const_iterator it = _inout.begin(), itEnd = _inout.end(); it != itEnd; ++it) for (InOut::const_iterator it = _inout.begin(), itEnd = _inout.end(); it != itEnd; ++it)
{ {
murmur.add(it->c_str(), it->size() ); murmur.add(it->c_str(), (uint32_t)it->size() );
} }
hash = murmur.end(); hash = murmur.end();
} }
@ -1379,7 +1384,7 @@ int main(int _argc, const char* _argv[])
} }
else if (0 == bx::stricmp(platform, "linux") ) else if (0 == bx::stricmp(platform, "linux") )
{ {
preprocessor.setDefine("BX_PLATFORM_IOS=1"); preprocessor.setDefine("BX_PLATFORM_LINUX=1");
preprocessor.setDefine("BGFX_SHADER_LANGUAGE_GLSL=1"); preprocessor.setDefine("BGFX_SHADER_LANGUAGE_GLSL=1");
glsl = true; glsl = true;
} }