projects / platform / upstream / glib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d76ac15)
MSVC Builds: GIO: Standardize zlib Linking
authorChun-wei Fan <fanchunwei@src.gnome.org>
Tue, 3 Mar 2015 10:24:08 +0000 (18:24 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Tue, 3 Mar 2015 10:24:58 +0000 (18:24 +0800)
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 patch | blob | history
build/win32/vs9/gio.vcprojin patch | blob | history

diff --git a/build/win32/vs10/gio.vcxprojin b/build/win32/vs10/gio.vcxprojin
index 5a968e519fe3ef3e3a895d0b33156bf325b3da76..18a8be1b1e977cdcf5030d9f1cf7f6db2c7a139e 100644 (file)
--- 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 cb8ca325ac86394b361f1132b256ef7ed43404a6..686b00bd0eb8be95645d7ca53dc34370613d5dc7 100644 (file)
--- 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"
Domain: System / Base;