]> git.rm.cloudns.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)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 10 Aug 2010 06:35:05 +0000 (08:35 +0200)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10381 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=68cb8232d851614b32389d634a7f4fa4576c8d58

sys_shared.c

index 423e71748cb6ce96dcae15cbdf057918ebccedce..e9211f424ac9c86d282200045aba41e571c807ef 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
@@ -124,7 +128,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