From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 9 Aug 2010 13:27:54 +0000 (+0000)
Subject: Win64 builds: search for DLLs in bin64/
X-Git-Tag: xonotic-v0.1.0preview~291
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=41a5d4e0e5e41024c35ce0d67a88232a68e886b3;p=xonotic%2Fdarkplaces.git

Win64 builds: search for DLLs in bin64/

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10381 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=68cb8232d851614b32389d634a7f4fa4576c8d58
---

diff --git a/sys_shared.c b/sys_shared.c
index 423e7174..e9211f42 100644
--- a/sys_shared.c
+++ b/sys_shared.c
@@ -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