Enable libtool compatible DLL naming in the VS9 projects

This commit is contained in:
Tor Lillqvist 2010-02-04 15:24:56 +02:00
parent bfd60d8835
commit 05291c0d11
6 changed files with 47 additions and 21 deletions

View File

@ -52,7 +52,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib shlwapi.lib dnsapi.lib"
OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="$(IntDir)\gio.def"
GenerateDebugInformation="true"
@ -98,7 +98,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib shlwapi.lib dnsapi.lib"
OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="1"
ModuleDefinitionFile="$(IntDir)\gio.def"
GenerateDebugInformation="true"
@ -148,7 +148,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib shlwapi.lib dnsapi.lib"
OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="$(IntDir)\gio.def"
GenerateDebugInformation="true"
@ -194,7 +194,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib shlwapi.lib dnsapi.lib"
OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="1"
ModuleDefinitionFile="$(IntDir)\gio.def"
GenerateDebugInformation="true"

View File

@ -52,7 +52,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="$(IntDir)\glib.def"
GenerateDebugInformation="true"
@ -99,7 +99,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="$(IntDir)\glib.def"
GenerateDebugInformation="true"
@ -144,7 +144,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="1"
ModuleDefinitionFile="$(IntDir)\glib.def"
GenerateDebugInformation="true"
@ -191,7 +191,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="1"
ModuleDefinitionFile="$(IntDir)\glib.def"
GenerateDebugInformation="true"

View File

@ -37,7 +37,7 @@ copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h&#x0D;&#
Name="GlibDoInstall"
Value="
mkdir $(OutDir)\bin&#x0D;&#x0A;
copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-2-vs9.dll $(OutDir)\bin&#x0D;&#x0A;
copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.dll $(OutDir)\bin&#x0D;&#x0A;
copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-genmarshal.exe $(OutDir)\bin&#x0D;&#x0A;
copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gspawn-win32-helper*.exe $(OutDir)\bin&#x0D;&#x0A;
@ -193,4 +193,30 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-2.0.lib $(OutDir)\
Name="GlibGenerateGioDef"
Value="echo EXPORTS &gt;&quot;$(IntDir)\gio.def&quot; &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF ..\..\..\gio\gio.symbols &gt;&gt;&quot;$(IntDir)\gio.def&quot;"
/>
<UserMacro
Name="GlibLibtoolCompatibleDllPrefix"
Value="lib"
/>
<UserMacro
Name="GlibLibtoolCompatibleDllSuffix"
Value="-2.0-0"
/>
<UserMacro
Name="GlibSeparateVS9DllPrefix"
Value=""
/>
<UserMacro
Name="GlibSeparateVS9DllSuffix"
Value="-2-vs9"
/>
<!-- Change these two to GlibLibtoolCompatibleDllPrefix and
GlibLibtoolCompatibleDllSuffix if that is what you want -->
<UserMacro
Name="GlibDllPrefix"
Value="$(GlibSeparateVS9DllPrefix)"
/>
<UserMacro
Name="GlibDllSuffix"
Value="$(GlibSeparateVS9DllSuffix)"
/>
</VisualStudioPropertySheet>

View File

@ -51,7 +51,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="$(IntDir)\gmodule.def"
GenerateDebugInformation="true"
@ -95,7 +95,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="1"
ModuleDefinitionFile="$(IntDir)\gmodule.def"
GenerateDebugInformation="true"
@ -143,7 +143,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="$(IntDir)\gmodule.def"
GenerateDebugInformation="true"
@ -187,7 +187,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="1"
ModuleDefinitionFile="$(IntDir)\gmodule.def"
GenerateDebugInformation="true"

View File

@ -50,7 +50,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="$(IntDir)\gobject.def"
GenerateDebugInformation="true"
@ -94,7 +94,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="1"
ModuleDefinitionFile="$(IntDir)\gobject.def"
GenerateDebugInformation="true"
@ -142,7 +142,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="$(IntDir)\gobject.def"
GenerateDebugInformation="true"
@ -186,7 +186,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="1"
ModuleDefinitionFile="$(IntDir)\gobject.def"
GenerateDebugInformation="true"

View File

@ -51,7 +51,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="../../../gthread/gthread.def"
GenerateDebugInformation="true"
@ -95,7 +95,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="1"
ModuleDefinitionFile="../../../gthread/gthread.def"
GenerateDebugInformation="true"
@ -143,7 +143,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="../../../gthread/gthread.def"
GenerateDebugInformation="true"
@ -187,7 +187,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="1"
ModuleDefinitionFile="../../../gthread/gthread.def"
GenerateDebugInformation="true"