]> git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
Win64 builds: search for DLLs in bin64/
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 9 Aug 2010 13:27:54 +0000 (13:27 +0000)
committerdivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 9 Aug 2010 13:27:54 +0000 (13:27 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10381 d7cf8633-e32d-0410-b094-e92efae38249

sys_shared.c

index 2ae309c12e06b3f8b1e70e35f5f728efa181b340..903bee1e6868edbe8363ea1791f2f5fdefccfcd8 100644 (file)
@@ -3,6 +3,10 @@
 #define SUPPORTDLL
 
 #ifdef WIN32
+# ifdef _WIN64
+#  define _WIN32_WINNT 0x0502
+   // for SetDllDirectory
+# endif
 # include <windows.h>
 # include <mmsystem.h> // timeGetTime
 # include <time.h> // localtime
@@ -127,7 +131,13 @@ notfound:
        {
                Con_DPrintf (" \"%s\"", dllnames[i]);
 #ifdef WIN32
+# ifdef _WIN64
+               SetDllDirectory("bin64");
+# endif
                dllhandle = LoadLibrary (dllnames[i]);
+# ifdef _WIN64
+               SetDllDirectory(NULL);
+# endif
 #else
                dllhandle = dlopen (dllnames[i], RTLD_LAZY | RTLD_GLOBAL);
 #endif