Merge branch 'master' into AutoGenerateTests

mellinoe · Jun 5, 2018 · 14fef61 · 14fef61
2 parents 0ccdec0 + c66f5f5
commit 14fef61
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/ShaderGen.App/Program.cs b/src/ShaderGen.App/Program.cs
@@ -327,7 +327,7 @@ private static bool CompileHlsl(string shaderPath, string entryPoint, ShaderFunc
                 p.Start();
                 var stdOut = p.StandardOutput.ReadToEndAsync();
                 var stdErr = p.StandardError.ReadToEndAsync();
-                bool exited = p.WaitForExit(2000);
+                bool exited = p.WaitForExit(60000);
 
                 if (exited && p.ExitCode == 0)
                 {