kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Fix d3dcompiler_47.dll loading on 64 bit build.

Browse source
This commit is contained in:
John Preston 2021-07-20 20:00:21 +03:00
parent fe0d8a1841
commit 1f19308300
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
win_directx_helper/win_directx_helper.cpp
View file

@ -151,13 +151,13 @@ bool ResolveD3DCompiler() {
return false; return false;
} }
#if defined _WIN32 #if defined _WIN64
const auto arch = L"x86";
#elif defined _WIN64 // _WIN32
const auto arch = L"x64"; const auto arch = L"x64";
#else // _WIN32 || _WIN64 #elif defined _WIN32 // _WIN64
const auto arch = L"x86";
#else // _WIN64 || _WIN32
#error "Invalid configuration." #error "Invalid configuration."
#endif // _WIN32 || _WIN64 #endif // _WIN64 || _WIN32
#define DESKTOP_APP_STRINGIFY2(x) #x #define DESKTOP_APP_STRINGIFY2(x) #x
#define DESKTOP_APP_STRINGIFY(x) DESKTOP_APP_STRINGIFY2(x) #define DESKTOP_APP_STRINGIFY(x) DESKTOP_APP_STRINGIFY2(x)
@ -171,7 +171,9 @@ bool ResolveD3DCompiler() {
if (FileSha256(path) == hash && ResolveD3DCompiler(path)) { if (FileSha256(path) == hash && ResolveD3DCompiler(path)) {
return true; return true;
} }
#endif // DESKTOP_APP_D3DCOMPILER_HASH #elif defined DESKTOP_APP_SPECIAL_TARGET // DESKTOP_APP_D3DCOMPILER_HASH
#error "Special target build should have d3dcompiler hash."
#endif // !DESKTOP_APP_D3DCOMPILER_HASH && DESKTOP_APP_SPECIAL_TARGET
return ResolveD3DCompiler(L"d3dcompiler_47.dll"); return ResolveD3DCompiler(L"d3dcompiler_47.dll");
}(); }();