Merge pull request #548 from baldurk/vs2010-compile-fixes

VS2010 compile fixes
2016-10-15 23:09:31 -06:00
parent bf8a6ef750 486d9e44e0
commit 1fabc0f697
9 changed files with 170 additions and 164 deletions
--- a/StandAlone/StandAlone.cpp
+++ b/StandAlone/StandAlone.cpp
@@ -673,11 +673,11 @@ void CompileAndLinkShaderFiles()
    // they are all getting linked together.)
    glslang::TWorkItem* workItem;
    while (Worklist.remove(workItem)) {
-        ShaderCompUnit compUnit = {
+        ShaderCompUnit compUnit(
            FindLanguage(workItem->name),
            workItem->name,
            ReadFileData(workItem->name.c_str())
-        };
+        );

        if (! compUnit.text) {
            usage();