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

Fixed include path to be relative to input file. Issue #34.

Browse Source
This commit is contained in:
bkaradzic 2013-05-20 22:20:11 -07:00
parent 383efbed99
commit 4ade0981f1
2 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
tools/bin/shaderc.exe
View File

Binary file not shown.

47
tools/shaderc/shaderc.cpp
View File

@ -1035,20 +1035,7 @@ struct Preprocessor
if (NULL != _includeDir) if (NULL != _includeDir)
{ {
char* start = scratch(_includeDir); addInclude(_includeDir);
for (char* split = strchr(start, ';'); NULL != split; split = strchr(start, ';'))
{
*split = '\0';
m_tagptr->tag = FPPTAG_INCLUDE_DIR;
m_tagptr->data = start;
m_tagptr++;
start = split + 1;
}
m_tagptr->tag = FPPTAG_INCLUDE_DIR;
m_tagptr->data = start;
m_tagptr++;
} }
m_default = "#define lowp\n#define mediump\n#define highp\n"; m_default = "#define lowp\n#define mediump\n#define highp\n";
@ -1085,6 +1072,24 @@ struct Preprocessor
va_end(argList); va_end(argList);
} }
void addInclude(const char* _includeDir)
{
char* start = scratch(_includeDir);
for (char* split = strchr(start, ';'); NULL != split; split = strchr(start, ';'))
{
*split = '\0';
m_tagptr->tag = FPPTAG_INCLUDE_DIR;
m_tagptr->data = start;
m_tagptr++;
start = split + 1;
}
m_tagptr->tag = FPPTAG_INCLUDE_DIR;
m_tagptr->data = start;
m_tagptr++;
}
void addDependency(const char* _fileName) void addDependency(const char* _fileName)
{ {
m_depends += " \\\n "; m_depends += " \\\n ";
@ -1373,6 +1378,17 @@ int main(int _argc, const char* _argv[])
Preprocessor preprocessor(filePath, includeDir); Preprocessor preprocessor(filePath, includeDir);
std::string dir;
{
const char* base = baseName(filePath);
if (base != filePath)
{
dir.assign(filePath, base-filePath);
preprocessor.addInclude(dir.c_str() );
}
}
preprocessor.setDefaultDefine("BX_PLATFORM_ANDROID"); preprocessor.setDefaultDefine("BX_PLATFORM_ANDROID");
preprocessor.setDefaultDefine("BX_PLATFORM_IOS"); preprocessor.setDefaultDefine("BX_PLATFORM_IOS");
preprocessor.setDefaultDefine("BX_PLATFORM_LINUX"); preprocessor.setDefaultDefine("BX_PLATFORM_LINUX");
@ -1459,7 +1475,8 @@ int main(int _argc, const char* _argv[])
{ {
VaryingMap varyingMap; VaryingMap varyingMap;
const char* varyingdef = cmdLine.findOption("varyingdef", "varying.def.sc"); std::string defaultVarying = dir + "varying.def.sc";
const char* varyingdef = cmdLine.findOption("varyingdef", defaultVarying.c_str() );
File attribdef(varyingdef); File attribdef(varyingdef);
const char* parse = attribdef.getData(); const char* parse = attribdef.getData();
if (NULL != parse if (NULL != parse