From 99e7a2ceac6c2f3ecb71208c3701df8dd7e5b9fc Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Mon, 31 May 2010 02:44:48 +0000 Subject: [PATCH] debug version of dx9 dll isn't always in the PATH, so you would get an error while dolphin would still load the correct release version of the lib and continue running. so...just check for the release version of the dll. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5554 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp index c230bec669..d956165f88 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp @@ -190,13 +190,7 @@ const int TS[6][2] = bool DXCheck( std::wstring& msg ) { - std::wstring dll = - #ifdef _DEBUG - StringFromFormat( _T("d3dx9d_%d.dll"), D3DX_SDK_VERSION); - #else - StringFromFormat( _T("d3dx9_%d.dll"), D3DX_SDK_VERSION); - #endif - HINSTANCE hDll = LoadLibrary(dll.c_str()); + HINSTANCE hDll = LoadLibrary(StringFromFormat( _T("d3dx9_%d.dll"), D3DX_SDK_VERSION).c_str()); if( !hDll ) { msg = _T("Please make sure that you have the latest version of DirectX 9.0c correctly installed.");