Use d3dx9.dll if available.

diff --git a/d3dshader.py b/d3dshader.py
index f48997f235228c4e4e5ebee678d4ba46076bf17f..24372e2aa9c46fc31a9850f0c471a4a83bb1ca67 100644 (file)
--- a/d3dshader.py
+++ b/d3dshader.py
@@ -58,13 +58,13 @@ typedef HRESULT
     if(firsttime) {
         if(!hD3DXModule) {
             unsigned release;
-            unsigned version;
+            int version;
             for(release = 0; release <= 1; ++release) {
                 /* Version 41 corresponds to Mar 2009 version of DirectX Runtime / SDK */ 
-                for(version = 41; version >= 24; --version) {
+                for(version = 41; version >= 0; --version) {
                     char filename[256];
                     _snprintf(filename, sizeof(filename), 
-                              "d3dx9%s_%u.dll", release ? "" : "d", version);
+                              "d3dx9%s%s%u.dll", release ? "" : "d", version ? "_" : "", version);
                     hD3DXModule = LoadLibraryA(filename);
                     if(hD3DXModule)
                         goto found;