Skip to content

I
Irrlicht New
Commit 4239a3d3 authored by mercury233's avatar mercury233 Committed by GitHub
Browse files
Options

fix missing __TEXT macro in #16 (#23)

parent 0d883411
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
source/Irrlicht/CD3D9ShaderMaterialRenderer.cpp
View file @ 4239a3d3
...@@ -325,9 +325,9 @@ HRESULT CD3D9ShaderMaterialRenderer::stubD3DXAssembleShader(LPCSTR pSrcData, ...@@ -325,9 +325,9 @@ HRESULT CD3D9ShaderMaterialRenderer::stubD3DXAssembleShader(LPCSTR pSrcData,
if (!pFn && !LoadFailed) if (!pFn && !LoadFailed)
{ {
// try to load dll // try to load dll
irr::core::string<TCHAR> strDllName = "d3dx9_"; irr::core::string<TCHAR> strDllName = __TEXT("d3dx9_");
strDllName += (int)D3DX_SDK_VERSION; strDllName += (int)D3DX_SDK_VERSION;
strDllName += ".dll"; strDllName += __TEXT(".dll");
HMODULE hMod = LoadLibrary(strDllName.c_str()); HMODULE hMod = LoadLibrary(strDllName.c_str());
if (hMod) if (hMod)
...@@ -385,9 +385,9 @@ HRESULT CD3D9ShaderMaterialRenderer::stubD3DXAssembleShaderFromFile(LPCSTR pSrcF ...@@ -385,9 +385,9 @@ HRESULT CD3D9ShaderMaterialRenderer::stubD3DXAssembleShaderFromFile(LPCSTR pSrcF
if (!pFn && !LoadFailed) if (!pFn && !LoadFailed)
{ {
// try to load dll // try to load dll
irr::core::string<TCHAR> strDllName = "d3dx9_"; irr::core::string<TCHAR> strDllName = __TEXT("d3dx9_");
strDllName += (int)D3DX_SDK_VERSION; strDllName += (int)D3DX_SDK_VERSION;
strDllName += ".dll"; strDllName += __TEXT(".dll");
HMODULE hMod = LoadLibrary(strDllName.c_str()); HMODULE hMod = LoadLibrary(strDllName.c_str());
if (hMod) if (hMod)
...@@ -446,9 +446,9 @@ HRESULT CD3D9ShaderMaterialRenderer::stubD3DXCompileShader(LPCSTR pSrcData, UINT ...@@ -446,9 +446,9 @@ HRESULT CD3D9ShaderMaterialRenderer::stubD3DXCompileShader(LPCSTR pSrcData, UINT
if (!pFn && !LoadFailed) if (!pFn && !LoadFailed)
{ {
// try to load dll // try to load dll
irr::core::string<TCHAR> strDllName = "d3dx9_"; irr::core::string<TCHAR> strDllName = __TEXT("d3dx9_");
strDllName += (int)D3DX_SDK_VERSION; strDllName += (int)D3DX_SDK_VERSION;
strDllName += ".dll"; strDllName += __TEXT(".dll");
HMODULE hMod = LoadLibrary(strDllName.c_str()); HMODULE hMod = LoadLibrary(strDllName.c_str());
if (hMod) if (hMod)
...@@ -506,9 +506,9 @@ HRESULT CD3D9ShaderMaterialRenderer::stubD3DXCompileShaderFromFile(LPCSTR pSrcFi ...@@ -506,9 +506,9 @@ HRESULT CD3D9ShaderMaterialRenderer::stubD3DXCompileShaderFromFile(LPCSTR pSrcFi
if (!pFn && !LoadFailed) if (!pFn && !LoadFailed)
{ {
// try to load dll // try to load dll
irr::core::string<TCHAR> strDllName = "d3dx9_"; irr::core::string<TCHAR> strDllName = __TEXT("d3dx9_");
strDllName += (int)D3DX_SDK_VERSION; strDllName += (int)D3DX_SDK_VERSION;
strDllName += ".dll"; strDllName += __TEXT(".dll");
HMODULE hMod = LoadLibrary(strDllName.c_str()); HMODULE hMod = LoadLibrary(strDllName.c_str());
if (hMod) if (hMod)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment