| Michael Stahl | 8a6c5b2 | 2012-11-17 00:39:31 +0100 | [diff] [blame] | 1 | Adapt VC10/MSVC2010 stuff for VC11/MSVC2012 (apparently builds with both then) |
| 2 | |
| 3 | diff -ru python3.old_/PCbuild/_msi.vcxproj python3/PCbuild/_msi.vcxproj |
| 4 | --- python3.old_/PCbuild/_msi.vcxproj 2012-09-29 10:00:48.000000000 +0200 |
| 5 | +++ python3/PCbuild/_msi.vcxproj 2012-11-13 15:52:40.656101165 +0100 |
| 6 | @@ -151,7 +151,7 @@ |
| 7 | </PropertyGroup> |
| 8 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
| 9 | <Link> |
| 10 | - <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 11 | + <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 12 | <BaseAddress>0x1D160000</BaseAddress> |
| 13 | </Link> |
| 14 | </ItemDefinitionGroup> |
| 15 | @@ -160,13 +160,13 @@ |
| 16 | <TargetEnvironment>X64</TargetEnvironment> |
| 17 | </Midl> |
| 18 | <Link> |
| 19 | - <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 20 | + <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 21 | <BaseAddress>0x1D160000</BaseAddress> |
| 22 | </Link> |
| 23 | </ItemDefinitionGroup> |
| 24 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
| 25 | <Link> |
| 26 | - <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 27 | + <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 28 | <BaseAddress>0x1D160000</BaseAddress> |
| 29 | </Link> |
| 30 | </ItemDefinitionGroup> |
| 31 | @@ -175,13 +175,13 @@ |
| 32 | <TargetEnvironment>X64</TargetEnvironment> |
| 33 | </Midl> |
| 34 | <Link> |
| 35 | - <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 36 | + <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 37 | <BaseAddress>0x1D160000</BaseAddress> |
| 38 | </Link> |
| 39 | </ItemDefinitionGroup> |
| 40 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'"> |
| 41 | <Link> |
| 42 | - <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 43 | + <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 44 | <BaseAddress>0x1D160000</BaseAddress> |
| 45 | </Link> |
| 46 | </ItemDefinitionGroup> |
| 47 | @@ -190,14 +190,14 @@ |
| 48 | <TargetEnvironment>X64</TargetEnvironment> |
| 49 | </Midl> |
| 50 | <Link> |
| 51 | - <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 52 | + <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 53 | <BaseAddress>0x1D160000</BaseAddress> |
| 54 | <TargetMachine>MachineX64</TargetMachine> |
| 55 | </Link> |
| 56 | </ItemDefinitionGroup> |
| 57 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'"> |
| 58 | <Link> |
| 59 | - <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 60 | + <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 61 | <BaseAddress>0x1D160000</BaseAddress> |
| 62 | </Link> |
| 63 | </ItemDefinitionGroup> |
| 64 | @@ -206,7 +206,7 @@ |
| 65 | <TargetEnvironment>X64</TargetEnvironment> |
| 66 | </Midl> |
| 67 | <Link> |
| 68 | - <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 69 | + <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 70 | <BaseAddress>0x1D160000</BaseAddress> |
| 71 | <TargetMachine>MachineX64</TargetMachine> |
| 72 | </Link> |