From 29001134cac322b540327843f2c3cff9b56511c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Tue, 26 May 2015 12:08:12 -0700 Subject: [PATCH] Removed dxguid from shaderc, use INITGUID instead. --- scripts/shaderc.lua | 5 ++--- tools/shaderc/shaderc_hlsl.cpp | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/shaderc.lua b/scripts/shaderc.lua index a52f74bb..5f6d4e4f 100644 --- a/scripts/shaderc.lua +++ b/scripts/shaderc.lua @@ -50,7 +50,7 @@ project "shaderc" "Cocoa.framework", } - configuration { "windows", "vs*" } + configuration { "vs*" } includedirs { path.join(GLSL_OPTIMIZER, "include/c99"), } @@ -61,10 +61,9 @@ project "shaderc" } - configuration { "windows" } + configuration { "vs* or mingw*" } links { "d3dcompiler", - "dxguid", } configuration {} diff --git a/tools/shaderc/shaderc_hlsl.cpp b/tools/shaderc/shaderc_hlsl.cpp index a804586a..e20e0954 100644 --- a/tools/shaderc/shaderc_hlsl.cpp +++ b/tools/shaderc/shaderc_hlsl.cpp @@ -7,6 +7,7 @@ #if SHADERC_CONFIG_HLSL +#define INITGUID #include #include