[glib/glib-2-22] Enable libtool compatible DLL naming in the VS9 projects
- From: Tor Lillqvist <tml src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [glib/glib-2-22] Enable libtool compatible DLL naming in the VS9 projects
- Date: Thu, 4 Feb 2010 13:25:22 +0000 (UTC)
commit e27528caccf0b2084a35f242e3a780ecbdcb1504
Author: Tor Lillqvist <tml iki fi>
Date: Thu Feb 4 15:24:56 2010 +0200
Enable libtool compatible DLL naming in the VS9 projects
build/win32/vs9/gio.vcproj | 8 ++++----
build/win32/vs9/glib.vcproj | 8 ++++----
build/win32/vs9/glib.vsprops | 28 +++++++++++++++++++++++++++-
build/win32/vs9/gmodule.vcproj | 8 ++++----
build/win32/vs9/gobject.vcproj | 8 ++++----
build/win32/vs9/gthread.vcproj | 8 ++++----
6 files changed, 47 insertions(+), 21 deletions(-)
---
diff --git a/build/win32/vs9/gio.vcproj b/build/win32/vs9/gio.vcproj
index 4d0b096..5f7e760 100644
--- a/build/win32/vs9/gio.vcproj
+++ b/build/win32/vs9/gio.vcproj
@@ -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"
diff --git a/build/win32/vs9/glib.vcproj b/build/win32/vs9/glib.vcproj
index 3da38b6..854f556 100644
--- a/build/win32/vs9/glib.vcproj
+++ b/build/win32/vs9/glib.vcproj
@@ -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"
diff --git a/build/win32/vs9/glib.vsprops b/build/win32/vs9/glib.vsprops
index 6f7a234..75006d4 100644
--- a/build/win32/vs9/glib.vsprops
+++ b/build/win32/vs9/glib.vsprops
@@ -37,7 +37,7 @@ copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h
&#
Name="GlibDoInstall"
Value="
mkdir $(OutDir)\bin

-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-2-vs9.dll $(OutDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.dll $(OutDir)\bin

copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-genmarshal.exe $(OutDir)\bin

copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gspawn-win32-helper*.exe $(OutDir)\bin

@@ -193,4 +193,30 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-2.0.lib $(OutDir)\
Name="GlibGenerateGioDef"
Value="echo EXPORTS >"$(IntDir)\gio.def" && 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 >>"$(IntDir)\gio.def""
/>
+ <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>
diff --git a/build/win32/vs9/gmodule.vcproj b/build/win32/vs9/gmodule.vcproj
index e8d7aa6..ba3f316 100644
--- a/build/win32/vs9/gmodule.vcproj
+++ b/build/win32/vs9/gmodule.vcproj
@@ -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"
diff --git a/build/win32/vs9/gobject.vcproj b/build/win32/vs9/gobject.vcproj
index 3e095d7..549c732 100644
--- a/build/win32/vs9/gobject.vcproj
+++ b/build/win32/vs9/gobject.vcproj
@@ -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"
diff --git a/build/win32/vs9/gthread.vcproj b/build/win32/vs9/gthread.vcproj
index 0dc118c..84181a5 100644
--- a/build/win32/vs9/gthread.vcproj
+++ b/build/win32/vs9/gthread.vcproj
@@ -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"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
