From 8b74c108a45b94ba0a02b3bf860abe3d3458b96e Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Sun, 29 May 2016 14:29:39 +0100 Subject: [PATCH] Revert "gsdx:windows: Fix Windows 7 compile" This reverts commit 7736c904570442c7923a2359bc62a4f978474d03. It wasn't actually a Windows 7 compile fix, but a bad build environment workaround. --- plugins/GSdx/GSDevice11.cpp | 2 +- plugins/GSdx/GSDeviceDX.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/GSdx/GSDevice11.cpp b/plugins/GSdx/GSDevice11.cpp index 5b537fc3a..1ed889392 100644 --- a/plugins/GSdx/GSDevice11.cpp +++ b/plugins/GSdx/GSDevice11.cpp @@ -771,7 +771,7 @@ void GSDevice11::InitExternalFX() if (fshader.good()) { shader << fshader.rdbuf(); - CompileShader(shader.str().c_str(), shader.str().length(), shader_name.c_str(), nullptr, "ps_main", nullptr, &m_shaderfx.ps); + CompileShader(shader.str().c_str(), shader.str().length(), shader_name.c_str(), D3D_COMPILE_STANDARD_FILE_INCLUDE, "ps_main", nullptr, &m_shaderfx.ps); } else { diff --git a/plugins/GSdx/GSDeviceDX.cpp b/plugins/GSdx/GSDeviceDX.cpp index 2d8f15da2..0d778cc17 100644 --- a/plugins/GSdx/GSDeviceDX.cpp +++ b/plugins/GSdx/GSDeviceDX.cpp @@ -45,7 +45,7 @@ bool GSDeviceDX::LoadD3DCompiler() // Windows 8.1 and later come with the latest d3dcompiler_47.dll, but // Windows 7 devs might also have the dll available for use (which will // have to be placed in the application directory) - s_d3d_compiler_dll = LoadLibraryEx("d3dcompiler_47.dll", nullptr, LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32); + s_d3d_compiler_dll = LoadLibraryEx(D3DCOMPILER_DLL, nullptr, LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32); // Windows Vista and 7 can use the older version. If the previous LoadLibrary // call fails on Windows 8.1 and later, then the user's system is likely