luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 15:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

build: Change DLL naming in Visual Studio projects

Browse Source 
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.
This commit is contained in:
Chun-wei Fan 2017-09-15 12:56:40 +08:00
parent 4fd056a5f5
commit 213c31a49d
2 changed files with 4 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
win32/vs10/glib-version-paths.props.in
View File

@ -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>

22
win32/vs9/glib-version-paths.vsprops.in
View File

@ -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"