From 213c31a49dcd404514cca73d084c48c3a388e2cb Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Fri, 15 Sep 2017 12:56:40 +0800
Subject: [PATCH] build: Change DLL naming in Visual Studio projects

The previous commit to glib/glibconfig.h.win32.in, though it improves
the state of GLib and fixes bugs, cannot be used as a drop-in
replacement for code that builds against the previous
glib/glibconfig.h(.win32.in) that were build using the Visual Studio
projects.  Change the DLL names as a result so that the likelihood of
problems caused by replacing existing GLib DLLs can be reduced--code
that was built against previous GLib MSVC builds should be rebuilt, so
that things will work with the newer DLLs, instead of depending on the
older DLLs.

Note that if Visual Studio builds are done through Meson, existing code
that link against GLib should be rebuilt as well, for the same reason.
DLLs built with the Visual Studio projects from 2.55.0 onwards should be
compatible with the ones that are built with Visual Studio via Meson.
---
 win32/vs10/glib-version-paths.props.in  | 20 ++------------------
 win32/vs9/glib-version-paths.vsprops.in | 22 ++--------------------
 2 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/win32/vs10/glib-version-paths.props.in b/win32/vs10/glib-version-paths.props.in
index e711df9e8..f55157c5e 100644
--- a/win32/vs10/glib-version-paths.props.in
+++ b/win32/vs10/glib-version-paths.props.in
@@ -6,12 +6,8 @@
     <ApiVersion>2.0</ApiVersion>
     <GlibEtcInstallRoot>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
     <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
-    <GlibLibtoolCompatibleDllPrefix>lib</GlibLibtoolCompatibleDllPrefix>
-    <GlibLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</GlibLibtoolCompatibleDllSuffix>
-    <GlibSeparateVSDllPrefix />
-    <GlibSeparateVSDllSuffix>-2-vs$(VSVer)</GlibSeparateVSDllSuffix>
-    <GlibDllPrefix>$(GlibSeparateVSDllPrefix)</GlibDllPrefix>
-    <GlibDllSuffix>$(GlibSeparateVSDllSuffix)</GlibDllSuffix>
+    <GlibDllPrefix></GlibDllPrefix>
+    <GlibDllSuffix>-2.0-0</GlibDllSuffix>
     <PythonDir Condition="'$(VisualStudioVersion)' == '10.0'">c:\python34</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)' == '11.0'">c:\python34</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)' == '12.0'">c:\python34</PythonDir>
@@ -37,18 +33,6 @@
     <BuildMacro Include="CopyDir">
       <Value>$(CopyDir)</Value>
     </BuildMacro>
-    <BuildMacro Include="GlibLibtoolCompatibleDllPrefix">
-      <Value>$(GlibLibtoolCompatibleDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GlibLibtoolCompatibleDllSuffix">
-      <Value>$(GlibLibtoolCompatibleDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GlibSeparateVSDllPrefix">
-      <Value>$(GlibSeparateVSDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GlibSeparateVSDllSuffix">
-      <Value>$(GlibSeparateVSDllSuffix)</Value>
-    </BuildMacro>
     <BuildMacro Include="GlibDllPrefix">
       <Value>$(GlibDllPrefix)</Value>
     </BuildMacro>
diff --git a/win32/vs9/glib-version-paths.vsprops.in b/win32/vs9/glib-version-paths.vsprops.in
index af7739fe3..c5c6c1b85 100644
--- a/win32/vs9/glib-version-paths.vsprops.in
+++ b/win32/vs9/glib-version-paths.vsprops.in
@@ -25,30 +25,12 @@
 		Value="$(GlibEtcInstallRoot)"
 	/>
 	<UserMacro
-		Name="GlibLibtoolCompatibleDllPrefix"
-		Value="lib"
-	/>
-	<UserMacro
-		Name="GlibLibtoolCompatibleDllSuffix"
-		Value="-$(ApiVersion)-0"
-	/>
-	<UserMacro
-		Name="GlibSeparateVSDllPrefix"
+		Name="GlibDllPrefix"
 		Value=""
 	/>
-	<UserMacro
-		Name="GlibSeparateVSDllSuffix"
-		Value="-2-vs$(VSVer)"
-	/>
-	<!-- Change these two to GlibLibtoolCompatibleDllPrefix and
-	GlibLibtoolCompatibleDllSuffix if that is what you want -->
-	<UserMacro
-		Name="GlibDllPrefix"
-		Value="$(GlibSeparateVSDllPrefix)"
-	/>
 	<UserMacro
 		Name="GlibDllSuffix"
-		Value="$(GlibSeparateVSDllSuffix)"
+		Value="-2.0-0"
 	/>
 	<UserMacro
 		Name="PythonDir"