[glib/glib-2-42] MSVC Builds: GIO: Standardize zlib Linking



commit e39e80d42dccca14ba9d1737fb4d49eaa9a1d4d0
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Mar 3 18:24:08 2015 +0800

    MSVC Builds: GIO: Standardize zlib Linking
    
    Link to zlib1.lib for all builds, as:
    -The notion of zlib1d.lib is rather not standardized across the board for
     most cases.
    -Easier for the grand all-in-one solution file.

 build/win32/vs10/gio.vcxprojin |    4 ++--
 build/win32/vs9/gio.vcprojin   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/build/win32/vs10/gio.vcxprojin b/build/win32/vs10/gio.vcxprojin
index 5a968e5..18a8be1 100644
--- a/build/win32/vs10/gio.vcxprojin
+++ b/build/win32/vs10/gio.vcxprojin
@@ -86,7 +86,7 @@
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
-      
<AdditionalDependencies>zlib1d.lib;$(WindowsNetworkingLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>zlib1.lib;$(WindowsNetworkingLibs);%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -137,7 +137,7 @@
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
-      
<AdditionalDependencies>zlib1d.lib;$(WindowsNetworkingLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>zlib1.lib;$(WindowsNetworkingLibs);%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
diff --git a/build/win32/vs9/gio.vcprojin b/build/win32/vs9/gio.vcprojin
index cb8ca32..686b00b 100644
--- a/build/win32/vs9/gio.vcprojin
+++ b/build/win32/vs9/gio.vcprojin
@@ -39,7 +39,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="zlib1d.lib $(WindowsNetworkingLibs)"
+                               AdditionalDependencies="zlib1.lib $(WindowsNetworkingLibs)"
                                OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
                                LinkIncremental="2"
                                GenerateDebugInformation="true"
@@ -103,7 +103,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="zlib1d.lib $(WindowsNetworkingLibs)"
+                               AdditionalDependencies="zlib1.lib $(WindowsNetworkingLibs)"
                                OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
                                LinkIncremental="2"
                                GenerateDebugInformation="true"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]