@@ -25,22 +25,39 @@ class NBL_API IApplicationFramework
25
25
localInputCWD (_localInputCWD), localOutputCWD(_localOutputCWD), sharedInputCWD(_sharedInputCWD), sharedOutputCWD(_sharedOutputCWD)
26
26
{
27
27
#if defined(_NBL_PLATFORM_WINDOWS_) && defined(_NBL_SHARED_BUILD_)
28
- HMODULE res = LoadLibraryExA (_NABLA_DLL_NAME_, NULL , LOAD_LIBRARY_SEARCH_APPLICATION_DIR);
29
- if (!res)
30
28
{
31
- const auto nablaBuiltDLL = (system::path (_NABLA_OUTPUT_DIR_).make_preferred () / _NABLA_DLL_NAME_).string ();
32
- res = LoadLibraryExA (nablaBuiltDLL.c_str (), NULL , LOAD_WITH_ALTERED_SEARCH_PATH);
33
- }
34
- if (!res)
29
+ HMODULE res = LoadLibraryExA (_NABLA_DLL_NAME_, NULL , LOAD_LIBRARY_SEARCH_APPLICATION_DIR);
30
+ if (!res)
31
+ {
32
+ const auto nablaBuiltDLL = (system::path (_NABLA_OUTPUT_DIR_).make_preferred () / _NABLA_DLL_NAME_).string ();
33
+ res = LoadLibraryExA (nablaBuiltDLL.c_str (), NULL , LOAD_WITH_ALTERED_SEARCH_PATH);
34
+ }
35
+ if (!res)
36
+ {
37
+ const auto nablaInstalledDLL = (system::path (_NABLA_INSTALL_DIR_).make_preferred () / _NABLA_DLL_NAME_).string ();
38
+ res = LoadLibraryExA (nablaInstalledDLL.c_str (), NULL , LOAD_WITH_ALTERED_SEARCH_PATH);
39
+ }
40
+ if (!res)
41
+ res = LoadLibraryExA (_NABLA_DLL_NAME_, NULL , LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
42
+ HRESULT hr = __HrLoadAllImportsForDll (_NABLA_DLL_NAME_);
43
+ assert (res && SUCCEEDED (hr));
44
+ }
45
+ #endif // _NBL_PLATFORM_WINDOWS_ && _NBL_SHARED_BUILD_
46
+
35
47
{
36
- const auto nablaInstalledDLL = (system::path (_NABLA_INSTALL_DIR_).make_preferred () / _NABLA_DLL_NAME_).string ();
37
- res = LoadLibraryExA (nablaInstalledDLL.c_str (), NULL , LOAD_WITH_ALTERED_SEARCH_PATH);
48
+ constexpr std::string_view DXCOMPILER_DLL_NAME = " dxcompiler.dll" ;
49
+
50
+ HMODULE res = LoadLibraryExA (DXCOMPILER_DLL_NAME.data (), NULL , LOAD_LIBRARY_SEARCH_APPLICATION_DIR);
51
+ if (!res)
52
+ {
53
+ const auto dxcBuiltDLL = (system::path (_DXC_DLL_).make_preferred ()).string ();
54
+ res = LoadLibraryExA (dxcBuiltDLL.c_str (), NULL , LOAD_WITH_ALTERED_SEARCH_PATH);
55
+ }
56
+ if (!res)
57
+ res = LoadLibraryExA (DXCOMPILER_DLL_NAME.data (), NULL , LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
58
+ HRESULT hr = __HrLoadAllImportsForDll (DXCOMPILER_DLL_NAME.data ());
59
+ assert (res && SUCCEEDED (hr));
38
60
}
39
- if (!res)
40
- res = LoadLibraryExA (_NABLA_DLL_NAME_, NULL , LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
41
- HRESULT hr = __HrLoadAllImportsForDll (_NABLA_DLL_NAME_);
42
- assert (res && SUCCEEDED (hr));
43
- #endif // _NBL_PLATFORM_WINDOWS_ && _NBL_SHARED_BUILD_
44
61
}
45
62
46
63
void onAppInitialized ()
0 commit comments