Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use long version string in the DLL names in MSVS 201x projects

Browse Source 
This makes them compatible with the makefiles and MSVS 200x projects.

Notice that wxVersionString will need to be set to "32", not "320", when 3.2.0
release is done, as the micro version component is only used in the DLL names
for the development releases but not stable ones.
This commit is contained in:
Vadim Zeitlin
2016-03-03 19:31:44 +01:00
parent 36febf2d8a
commit 30393a178f
4 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build/msw/wx_base.vcxproj
View File

@@ -124,12 +124,12 @@
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</GenerateManifest>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(wxBaseLibNamePrefix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(wxBaseLibNamePrefix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(wxBaseLibNamePrefix)$(wxToolkitDllNameSuffix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(wxBaseLibNamePrefix)$(wxToolkitDllNameSuffix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(wxBaseDllNamePrefix)$(wxToolkitDllNameSuffix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(wxBaseDllNamePrefix)$(wxToolkitDllNameSuffix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(wxBaseLibNamePrefix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(wxBaseLibNamePrefix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(wxBaseLibNamePrefix)$(wxToolkitDllNameSuffix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(wxBaseLibNamePrefix)$(wxToolkitDllNameSuffix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(wxBaseDllNamePrefix)$(wxToolkitDllNameSuffix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(wxBaseDllNamePrefix)$(wxToolkitDllNameSuffix)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>

10
build/msw/wx_net.vcxproj
View File

@@ -126,10 +126,10 @@
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(wxBaseLibNamePrefix)_$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(wxBaseLibNamePrefix)_$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(wxBaseLibNamePrefix)_$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(wxBaseDllNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(wxBaseDllNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(wxBaseDllNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(wxBaseDllNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@@ -513,4 +513,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

4
build/msw/wx_setup.props
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
<wxVersionString>310</wxVersionString>
<wxShortVersionString>31</wxShortVersionString>
<wxToolkitPrefix>msw</wxToolkitPrefix>
<wxCompilerPrefix>vc</wxCompilerPrefix>
@@ -62,9 +63,10 @@
</PropertyGroup>
<PropertyGroup Label="UserMacros">
<wxIncSubDir>$(wxToolkitPrefix)$(wxSuffix)</wxIncSubDir>
<wxToolkitDllNamePrefix>wx$(wxToolkitPrefix)$(wxShortVersionString)$(wxSuffix)_</wxToolkitDllNamePrefix>
<wxToolkitDllNamePrefix>wx$(wxToolkitPrefix)$(wxVersionString)$(wxSuffix)_</wxToolkitDllNamePrefix>
<wxToolkitDllNameSuffix>_$(wxCompilerPrefix)$(wxArchSuffix)_$(wxVendor)</wxToolkitDllNameSuffix>
<wxToolkitLibNamePrefix>wx$(wxToolkitPrefix)$(wxShortVersionString)$(wxSuffix)_</wxToolkitLibNamePrefix>
<wxBaseDllNamePrefix>wxbase$(wxVersionString)$(wxSuffix)</wxBaseDllNamePrefix>
<wxBaseLibNamePrefix>wxbase$(wxShortVersionString)$(wxSuffix)</wxBaseLibNamePrefix>
</PropertyGroup>
<ItemDefinitionGroup>

10
build/msw/wx_xml.vcxproj
View File

@@ -126,10 +126,10 @@
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(wxBaseLibNamePrefix)_$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(wxBaseLibNamePrefix)_$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(wxBaseLibNamePrefix)_$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(wxBaseDllNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(wxBaseDllNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(wxBaseDllNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(wxBaseDllNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@@ -494,4 +494,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>