diff --git a/examples/10-font/font.cpp b/examples/10-font/font.cpp index bdd987a9..3db40df0 100644 --- a/examples/10-font/font.cpp +++ b/examples/10-font/font.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include "../common/entry.h" #include "../common/dbg.h" #include "../common/math.h" @@ -18,12 +19,6 @@ #include #include -#if defined(__MINGW32__) -# define swnprintf(_out, _count, _format, ...) swprintf(_out, _format, ##__VA_ARGS__) -#else -# define swnprintf(_out, _count, _format, ...) swprintf(_out, _count, _format, ##__VA_ARGS__) -#endif // defined(__MINGW__) - int _main_(int /*_argc*/, char** /*_argv*/) { uint32_t width = 1280; @@ -151,7 +146,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) // Use transient text to display debug information. wchar_t fpsText[64]; - swnprintf(fpsText, countof(fpsText), L"Frame: % 7.3f[ms]", double(frameTime) * toMs); + bx::swnprintf(fpsText, countof(fpsText), L"Frame: % 7.3f[ms]", double(frameTime) * toMs); textBufferManager->clearTextBuffer(transientText); textBufferManager->setPenPosition(transientText, 20.0, 4.0f); diff --git a/tools/bin/shaderc.exe b/tools/bin/shaderc.exe index 774927cc..39b54258 100644 Binary files a/tools/bin/shaderc.exe and b/tools/bin/shaderc.exe differ diff --git a/tools/shaderc/shaderc.cpp b/tools/shaderc/shaderc.cpp index 33328a16..2491bc98 100644 --- a/tools/shaderc/shaderc.cpp +++ b/tools/shaderc/shaderc.cpp @@ -1459,8 +1459,15 @@ int main(int _argc, const char* _argv[]) { VaryingMap varyingMap; - File attribdef(cmdLine.findOption("varyingdef", "varying.def.sc") ); + const char* varyingdef = cmdLine.findOption("varyingdef", "varying.def.sc"); + File attribdef(varyingdef); const char* parse = attribdef.getData(); + if (NULL != parse + && *parse != '\0') + { + preprocessor.addDependency(varyingdef); + } + while (NULL != parse && *parse != '\0') {