From a9de8b8f55ea06ece235fde2667389cf1b3aba33 Mon Sep 17 00:00:00 2001 From: goyuken Date: Tue, 9 Oct 2012 20:57:55 +0000 Subject: [PATCH] move libgambatte.dll to a "dll" subdirectory --- BizHawk.MultiClient/Program.cs | 3 +++ BizHawk.MultiClient/output/MakeRelease.bat | 2 +- .../output/{ => dll}/libgambatte.dll | Bin BizHawk.Util/Win32.cs | 5 ++--- 4 files changed, 6 insertions(+), 4 deletions(-) rename BizHawk.MultiClient/output/{ => dll}/libgambatte.dll (100%) diff --git a/BizHawk.MultiClient/Program.cs b/BizHawk.MultiClient/Program.cs index f18f4d0b8a..ba8d959e27 100644 --- a/BizHawk.MultiClient/Program.cs +++ b/BizHawk.MultiClient/Program.cs @@ -46,6 +46,9 @@ namespace BizHawk.MultiClient Global.Config = ConfigService.Load(PathManager.DefaultIniPath, new Config()); + // this will look in subdirectory "dll" to load pinvoked stuff + Win32.SetDllDirectory("dll"); + #if WINDOWS try { Global.DSound = new DirectSound(); } catch diff --git a/BizHawk.MultiClient/output/MakeRelease.bat b/BizHawk.MultiClient/output/MakeRelease.bat index d2db1c7418..0320922e29 100644 --- a/BizHawk.MultiClient/output/MakeRelease.bat +++ b/BizHawk.MultiClient/output/MakeRelease.bat @@ -1,3 +1,3 @@ del /s BizHawk.zip copy ..\..\SlimDx.dll -zip -X -9 -r BizHawk.zip BizHawk.MultiClient.exe DiscoHawk.exe *.dll ffmpeg.exe gamedb NES\Palettes Lua Gameboy\Palettes \ No newline at end of file +zip -X -9 -r BizHawk.zip BizHawk.MultiClient.exe DiscoHawk.exe *.dll dll ffmpeg.exe gamedb NES\Palettes Lua Gameboy\Palettes \ No newline at end of file diff --git a/BizHawk.MultiClient/output/libgambatte.dll b/BizHawk.MultiClient/output/dll/libgambatte.dll similarity index 100% rename from BizHawk.MultiClient/output/libgambatte.dll rename to BizHawk.MultiClient/output/dll/libgambatte.dll diff --git a/BizHawk.Util/Win32.cs b/BizHawk.Util/Win32.cs index 00b4be3e8c..aebcf806cb 100644 --- a/BizHawk.Util/Win32.cs +++ b/BizHawk.Util/Win32.cs @@ -437,12 +437,11 @@ namespace BizHawk return new string(chs); } - - [DllImport("user32.dll", CharSet = CharSet.Auto)] public static extern int SendMessage(IntPtr hWnd, int msg, int wParam, int lParam); - + [DllImport("kernel32.dll", SetLastError = true)] + public static extern bool SetDllDirectory(string lpPathName); } } \ No newline at end of file