projects / platform / upstream / glib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bfd60d8)
Enable libtool compatible DLL naming in the VS9 projects
authorTor Lillqvist <tml@iki.fi>
Thu, 4 Feb 2010 13:24:56 +0000 (15:24 +0200)
committerTor Lillqvist <tml@iki.fi>
Thu, 4 Feb 2010 17:58:21 +0000 (19:58 +0200)
build/win32/vs9/gio.vcproj patch | blob | history
build/win32/vs9/glib.vcproj patch | blob | history
build/win32/vs9/glib.vsprops patch | blob | history
build/win32/vs9/gmodule.vcproj patch | blob | history
build/win32/vs9/gobject.vcproj patch | blob | history
build/win32/vs9/gthread.vcproj patch | blob | history

diff --git a/build/win32/vs9/gio.vcproj b/build/win32/vs9/gio.vcproj
index 4d0b096..5f7e760 100644 (file)
--- 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 (file)
--- 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 (file)
--- a/build/win32/vs9/glib.vsprops
+++ b/build/win32/vs9/glib.vsprops
@@ -37,7 +37,7 @@ copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h&#x0D;&#
                Name="GlibDoInstall"\r
                Value="\r
 mkdir $(OutDir)\bin&#x0D;&#x0A;\r
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-2-vs9.dll $(OutDir)\bin&#x0D;&#x0A;\r
+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.dll $(OutDir)\bin&#x0D;&#x0A;\r
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-genmarshal.exe $(OutDir)\bin&#x0D;&#x0A;\r
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gspawn-win32-helper*.exe $(OutDir)\bin&#x0D;&#x0A;\r
 \r
@@ -193,4 +193,30 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-2.0.lib $(OutDir)\
                Name="GlibGenerateGioDef"\r
                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;"\r
        />\r
+       <UserMacro\r
+               Name="GlibLibtoolCompatibleDllPrefix"\r
+               Value="lib"\r
+       />\r
+       <UserMacro\r
+               Name="GlibLibtoolCompatibleDllSuffix"\r
+               Value="-2.0-0"\r
+       />\r
+       <UserMacro\r
+               Name="GlibSeparateVS9DllPrefix"\r
+               Value=""\r
+       />\r
+       <UserMacro\r
+               Name="GlibSeparateVS9DllSuffix"\r
+               Value="-2-vs9"\r
+       />\r
+       <!-- Change these two to GlibLibtoolCompatibleDllPrefix and\r
+       GlibLibtoolCompatibleDllSuffix if that is what you want -->\r
+       <UserMacro\r
+               Name="GlibDllPrefix"\r
+               Value="$(GlibSeparateVS9DllPrefix)"\r
+       />\r
+       <UserMacro\r
+               Name="GlibDllSuffix"\r
+               Value="$(GlibSeparateVS9DllSuffix)"\r
+       />\r
 </VisualStudioPropertySheet>\r
diff --git a/build/win32/vs9/gmodule.vcproj b/build/win32/vs9/gmodule.vcproj
index e8d7aa6..ba3f316 100644 (file)
--- 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 (file)
--- 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 (file)
--- a/build/win32/vs9/gthread.vcproj
+++ b/build/win32/vs9/gthread.vcproj
@@ -51,7 +51,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"\r
+                               OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="../../../gthread/gthread.def"\r
                                GenerateDebugInformation="true"\r
@@ -95,7 +95,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"\r
+                               OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"\r
                                LinkIncremental="1"\r
                                ModuleDefinitionFile="../../../gthread/gthread.def"\r
                                GenerateDebugInformation="true"\r
@@ -143,7 +143,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"\r
+                               OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="../../../gthread/gthread.def"\r
                                GenerateDebugInformation="true"\r
@@ -187,7 +187,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"\r
+                               OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"\r
                                LinkIncremental="1"\r
                                ModuleDefinitionFile="../../../gthread/gthread.def"\r
                                GenerateDebugInformation="true"\r
Domain: System / Base;