[georest] push by jumpinja...@gmail.com - Issue 26: Fix zlib build failure due to non-existent VS property sheet on 2012-01-13 08:04 GMT

3 views
Skip to first unread message

geo...@googlecode.com

unread,
Jan 13, 2012, 3:04:58 AM1/13/12
to georest...@googlegroups.com
Revision: 6739134b7fbb
Author: Jackie Ng <jumpin...@gmail.com>
Date: Fri Jan 13 00:03:31 2012
Log: Issue 26: Fix zlib build failure due to non-existent VS property
sheet
http://code.google.com/p/georest/source/detail?r=6739134b7fbb

Modified:
/src/Thirdparty/zlib-1.2.3/contrib/vstudio/vc9/miniunz.vcproj
/src/Thirdparty/zlib-1.2.3/contrib/vstudio/vc9/minizip.vcproj
/src/Thirdparty/zlib-1.2.3/contrib/vstudio/vc9/testzlibdll.vcproj
/src/Thirdparty/zlib-1.2.3/contrib/vstudio/vc9/zlibstat.vcproj
/src/Thirdparty/zlib-1.2.3/contrib/vstudio/vc9/zlibvc.vcproj

=======================================
--- /src/Thirdparty/zlib-1.2.3/contrib/vstudio/vc9/miniunz.vcproj Mon Jan
9 05:56:56 2012
+++ /src/Thirdparty/zlib-1.2.3/contrib/vstudio/vc9/miniunz.vcproj Fri Jan
13 00:03:31 2012
@@ -26,7 +26,6 @@
OutputDirectory="x86\MiniUnzip$(ConfigurationName)"
IntermediateDirectory="x86\MiniUnzip$(ConfigurationName)\Tmp"
ConfigurationType="1"
- InheritedPropertySheets="C:\Program Files\Microsoft Visual Studio
9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
CharacterSet="2"
>
<Tool
@@ -108,7 +107,6 @@
OutputDirectory="x64\MiniUnzip$(ConfigurationName)"
IntermediateDirectory="x64\MiniUnzip$(ConfigurationName)\Tmp"
ConfigurationType="1"
- InheritedPropertySheets="C:\Program Files\Microsoft Visual Studio
9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
CharacterSet="2"
>
<Tool
@@ -191,7 +189,6 @@
OutputDirectory="x86\MiniUnzip$(ConfigurationName)"
IntermediateDirectory="x86\MiniUnzip$(ConfigurationName)\Tmp"
ConfigurationType="1"
- InheritedPropertySheets="C:\Program Files\Microsoft Visual Studio
9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
CharacterSet="2"
>
<Tool
@@ -278,7 +275,6 @@
OutputDirectory="x64\MiniUnzip$(ConfigurationName)"
IntermediateDirectory="x64\MiniUnzip$(ConfigurationName)\Tmp"
ConfigurationType="1"
- InheritedPropertySheets="C:\Program Files\Microsoft Visual Studio
9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
CharacterSet="2"
>
<Tool
@@ -366,7 +362,6 @@
OutputDirectory="ia64\MiniUnzip$(ConfigurationName)"
IntermediateDirectory="ia64\MiniUnzip$(ConfigurationName)\Tmp"
ConfigurationType="1"
- InheritedPropertySheets="UpgradeFromVC70.vsprops"
CharacterSet="2"
>
<Tool
@@ -450,7 +445,6 @@
OutputDirectory="ia64\MiniUnzip$(ConfigurationName)"
IntermediateDirectory="ia64\MiniUnzip$(ConfigurationName)\Tmp"
ConfigurationType="1"
- InheritedPropertySheets="UpgradeFromVC70.vsprops"
CharacterSet="2"
>
<Tool
=======================================
--- /src/Thirdparty/zlib-1.2.3/contrib/vstudio/vc9/minizip.vcproj Mon Jan
9 05:56:56 2012
+++ /src/Thirdparty/zlib-1.2.3/contrib/vstudio/vc9/minizip.vcproj Fri Jan
13 00:03:31 2012
@@ -26,7 +26,6 @@
OutputDirectory="x86\MiniZip$(ConfigurationName)"
IntermediateDirectory="x86\MiniZip$(ConfigurationName)\Tmp"
ConfigurationType="1"
- InheritedPropertySheets="C:\Program Files\Microsoft Visual Studio
9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
CharacterSet="2"
>
<Tool
@@ -108,7 +107,6 @@
OutputDirectory="x64\$(ConfigurationName)"
IntermediateDirectory="x64\$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="C:\Program Files\Microsoft Visual Studio
9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
CharacterSet="2"
>
<Tool
@@ -191,7 +189,6 @@
OutputDirectory="x86\MiniZip$(ConfigurationName)"
IntermediateDirectory="x86\MiniZip$(ConfigurationName)\Tmp"
ConfigurationType="1"
- InheritedPropertySheets="C:\Program Files\Microsoft Visual Studio
9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
CharacterSet="2"
>
<Tool
@@ -277,7 +274,6 @@
OutputDirectory="x64\$(ConfigurationName)"
IntermediateDirectory="x64\$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="C:\Program Files\Microsoft Visual Studio
9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
CharacterSet="2"
>
<Tool
@@ -364,7 +360,6 @@
OutputDirectory="ia64\$(ConfigurationName)"
IntermediateDirectory="ia64\$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="UpgradeFromVC70.vsprops"
CharacterSet="2"
>
<Tool
@@ -448,7 +443,6 @@
OutputDirectory="ia64\$(ConfigurationName)"
IntermediateDirectory="ia64\$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="UpgradeFromVC70.vsprops"
CharacterSet="2"
>
<Tool
=======================================
--- /src/Thirdparty/zlib-1.2.3/contrib/vstudio/vc9/testzlibdll.vcproj Mon
Jan 9 05:56:56 2012
+++ /src/Thirdparty/zlib-1.2.3/contrib/vstudio/vc9/testzlibdll.vcproj Fri
Jan 13 00:03:31 2012
@@ -26,7 +26,6 @@
OutputDirectory="x86\TestZlibDll$(ConfigurationName)"
IntermediateDirectory="x86\TestZlibDll$(ConfigurationName)\Tmp"
ConfigurationType="1"
- InheritedPropertySheets="C:\Program Files\Microsoft Visual Studio
9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
CharacterSet="2"
>
<Tool
@@ -108,7 +107,6 @@
OutputDirectory="x64\TestZlibDll$(ConfigurationName)"
IntermediateDirectory="x64\TestZlibDll$(ConfigurationName)\Tmp"
ConfigurationType="1"
- InheritedPropertySheets="C:\Program Files\Microsoft Visual Studio
9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
CharacterSet="2"
>
<Tool
@@ -191,7 +189,6 @@
OutputDirectory="x86\TestZlibDll$(ConfigurationName)"
IntermediateDirectory="x86\TestZlibDll$(ConfigurationName)\Tmp"
ConfigurationType="1"
- InheritedPropertySheets="C:\Program Files\Microsoft Visual Studio
9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
CharacterSet="2"
>
<Tool
@@ -278,7 +275,6 @@
OutputDirectory="x64\TestZlibDll$(ConfigurationName)"
IntermediateDirectory="x64\TestZlibDll$(ConfigurationName)\Tmp"
ConfigurationType="1"
- InheritedPropertySheets="C:\Program Files\Microsoft Visual Studio
9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
CharacterSet="2"
>
<Tool
@@ -366,7 +362,6 @@
OutputDirectory="ia64\TestZlibDll$(ConfigurationName)"
IntermediateDirectory="ia64\TestZlibDll$(ConfigurationName)\Tmp"
ConfigurationType="1"
- InheritedPropertySheets="UpgradeFromVC70.vsprops"
CharacterSet="2"
>
<Tool
@@ -450,7 +445,6 @@
OutputDirectory="ia64\TestZlibDll$(ConfigurationName)"
IntermediateDirectory="ia64\TestZlibDll$(ConfigurationName)\Tmp"
ConfigurationType="1"
- InheritedPropertySheets="UpgradeFromVC70.vsprops"
CharacterSet="2"
>
<Tool
=======================================
--- /src/Thirdparty/zlib-1.2.3/contrib/vstudio/vc9/zlibstat.vcproj Mon Jan
9 05:56:56 2012
+++ /src/Thirdparty/zlib-1.2.3/contrib/vstudio/vc9/zlibstat.vcproj Fri Jan
13 00:03:31 2012
@@ -25,7 +25,6 @@
OutputDirectory="x86\ZlibStat$(ConfigurationName)"
IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"
ConfigurationType="4"
- InheritedPropertySheets="C:\Program Files\Microsoft Visual Studio
9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -98,7 +97,6 @@
OutputDirectory="x64\ZlibStat$(ConfigurationName)"
IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"
ConfigurationType="4"
- InheritedPropertySheets="C:\Program Files\Microsoft Visual Studio
9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -172,7 +170,6 @@
OutputDirectory="x86\ZlibStat$(ConfigurationName)"
IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"
ConfigurationType="4"
- InheritedPropertySheets="C:\Program Files\Microsoft Visual Studio
9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -246,7 +243,6 @@
OutputDirectory="x64\ZlibStat$(ConfigurationName)"
IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"
ConfigurationType="4"
- InheritedPropertySheets="C:\Program Files\Microsoft Visual Studio
9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -321,7 +317,6 @@
OutputDirectory="x86\ZlibStat$(ConfigurationName)"
IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"
ConfigurationType="4"
- InheritedPropertySheets="C:\Program Files\Microsoft Visual Studio
9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -394,7 +389,6 @@
OutputDirectory="x64\ZlibStat$(ConfigurationName)"
IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"
ConfigurationType="4"
- InheritedPropertySheets="C:\Program Files\Microsoft Visual Studio
9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -468,7 +462,6 @@
OutputDirectory="ia64\ZlibStat$(ConfigurationName)"
IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"
ConfigurationType="4"
- InheritedPropertySheets="UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -542,7 +535,6 @@
OutputDirectory="ia64\ZlibStat$(ConfigurationName)"
IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"
ConfigurationType="4"
- InheritedPropertySheets="UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -616,7 +608,6 @@
OutputDirectory="ia64\ZlibStat$(ConfigurationName)"
IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"
ConfigurationType="4"
- InheritedPropertySheets="UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
=======================================
--- /src/Thirdparty/zlib-1.2.3/contrib/vstudio/vc9/zlibvc.vcproj Mon Jan 9
05:56:56 2012
+++ /src/Thirdparty/zlib-1.2.3/contrib/vstudio/vc9/zlibvc.vcproj Fri Jan 13
00:03:31 2012
@@ -25,7 +25,6 @@
OutputDirectory="x86\ZlibDll$(ConfigurationName)"
IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"
ConfigurationType="2"
- InheritedPropertySheets="C:\Program Files\Microsoft Visual Studio
9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -122,7 +121,6 @@
OutputDirectory="x64\ZlibDll$(ConfigurationName)"
IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"
ConfigurationType="2"
- InheritedPropertySheets="C:\Program Files\Microsoft Visual Studio
9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -219,7 +217,6 @@
OutputDirectory="x86\ZlibDll$(ConfigurationName)"
IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"
ConfigurationType="2"
- InheritedPropertySheets="C:\Program Files\Microsoft Visual Studio
9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
WholeProgramOptimization="1"
@@ -319,7 +316,6 @@
OutputDirectory="x64\ZlibDll$(ConfigurationName)"
IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"
ConfigurationType="2"
- InheritedPropertySheets="C:\Program Files\Microsoft Visual Studio
9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
WholeProgramOptimization="1"
@@ -419,7 +415,6 @@
OutputDirectory="x86\ZlibDll$(ConfigurationName)"
IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"
ConfigurationType="2"
- InheritedPropertySheets="C:\Program Files\Microsoft Visual Studio
9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
WholeProgramOptimization="1"
@@ -520,7 +515,6 @@
OutputDirectory="x64\ZlibDll$(ConfigurationName)"
IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"
ConfigurationType="2"
- InheritedPropertySheets="C:\Program Files\Microsoft Visual Studio
9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
WholeProgramOptimization="1"
@@ -621,7 +615,6 @@
OutputDirectory="ia64\ZlibDll$(ConfigurationName)"
IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"
ConfigurationType="2"
- InheritedPropertySheets="UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -718,7 +711,6 @@
OutputDirectory="ia64\ZlibDll$(ConfigurationName)"
IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"
ConfigurationType="2"
- InheritedPropertySheets="UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
WholeProgramOptimization="1"
@@ -819,7 +811,6 @@
OutputDirectory="ia64\ZlibDll$(ConfigurationName)"
IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"
ConfigurationType="2"
- InheritedPropertySheets="UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
WholeProgramOptimization="1"

Reply all
Reply to author
Forward
0 new messages