Mercurial > pidgin3 / changeset

--- a/meson.build	Thu May 24 21:00:25 2018 -0500
+++ b/meson.build	Thu May 24 21:26:44 2018 -0500
@@ -91,6 +91,9 @@
 		conf.set('IS_WIN32_CROSS_COMPILED', true)
 	endif
 	conf.set('WIN32_LEAN_AND_MEAN', true)
+
+	conf.set('LIBPIDGIN_DLL_NAMEW',
+	    'L"libpidgin-@0@.dll"'.format(purple_lt_current))
 else
 	IS_WIN32 = false
 	ws2_32 = []

--- a/pidgin/win32/winpidgin.c	Thu May 24 21:00:25 2018 -0500
+++ b/pidgin/win32/winpidgin.c	Thu May 24 21:26:44 2018 -0500
@@ -366,7 +366,7 @@
 			return 0;
 
 	/* Now we are ready for Pidgin .. */
-	if ((hmod = LoadLibraryW(L"libpidgin-20.dll")))
+	if ((hmod = LoadLibraryW(LIBPIDGIN_DLL_NAMEW)))
 		pidgin_main = (LPFNPIDGINMAIN) GetProcAddress(hmod, "pidgin_main");
 
 	if (!pidgin_main) {
@@ -374,8 +374,8 @@
 		const wchar_t *err_msg = get_win32_error_message(dw);
 
 		_snwprintf(errbuf, sizeof(errbuf) / sizeof(wchar_t),
-				L"Error loading libpidgin-20.dll.\n"
-				"Error: (%u) %s", (UINT) dw, err_msg);
+				L"Error loading %s.\nError: (%u) %s",
+				LIBPIDGIN_DLL_NAMEW, (UINT) dw, err_msg);
 		wprintf(L"%s\n", errbuf);
 		MessageBoxW(NULL, errbuf, L"Error", MB_OK | MB_TOPMOST);