OLD | NEW |
---|---|
1 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 <PropertyGroup> | 2 <PropertyGroup> |
3 | 3 |
4 <VCInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\ 10.0\Setup\VC@ProductDir)</VCInstallDir> | 4 <VCInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\ 10.0\Setup\VC@ProductDir)</VCInstallDir> |
5 <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACH INE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\10.0\Setup\VC@ProductDir)</VCIns tallDir> | 5 <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACH INE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\10.0\Setup\VC@ProductDir)</VCIns tallDir> |
6 <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACH INE\SOFTWARE\Microsoft\VCExpress\10.0\Setup\VC@ProductDir)</VCInstallDir> | 6 <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACH INE\SOFTWARE\Microsoft\VCExpress\10.0\Setup\VC@ProductDir)</VCInstallDir> |
7 <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACH INE\SOFTWARE\Wow6432Node\Microsoft\VCExpress\10.0\Setup\VC@ProductDir)</VCInstal lDir> | 7 <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACH INE\SOFTWARE\Wow6432Node\Microsoft\VCExpress\10.0\Setup\VC@ProductDir)</VCInstal lDir> |
8 | 8 |
9 <VSInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\ 10.0\Setup\VS@ProductDir)</VSInstallDir> | 9 <VSInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\ 10.0\Setup\VS@ProductDir)</VSInstallDir> |
10 <VSInstallDir Condition="'$(VSInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACH INE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\10.0\Setup\VS@ProductDir)</VSIns tallDir> | 10 <VSInstallDir Condition="'$(VSInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACH INE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\10.0\Setup\VS@ProductDir)</VSIns tallDir> |
11 <VSInstallDir Condition="'$(VSInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACH INE\SOFTWARE\Microsoft\VCExpress\10.0\Setup\VS@ProductDir)</VSInstallDir> | 11 <VSInstallDir Condition="'$(VSInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACH INE\SOFTWARE\Microsoft\VCExpress\10.0\Setup\VS@ProductDir)</VSInstallDir> |
12 <VSInstallDir Condition="'$(VSInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACH INE\SOFTWARE\Wow6432Node\Microsoft\VCExpress\10.0\Setup\VS@ProductDir)</VSInstal lDir> | 12 <VSInstallDir Condition="'$(VSInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACH INE\SOFTWARE\Wow6432Node\Microsoft\VCExpress\10.0\Setup\VS@ProductDir)</VSInstal lDir> |
13 | 13 |
14 <WindowsSdkDir Condition="'$(UseEnv)' != 'true'">$(Registry:HKEY_LOCAL_MACHI NE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)</WindowsS dkDir> | 14 <WindowsSdkDir Condition="'$(UseEnv)' != 'true'">$(Registry:HKEY_LOCAL_MACHI NE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)</WindowsS dkDir> |
15 <WindowsSdkDir Condition="'$(WindowsSdkDir)' == ''">$(Registry:HKEY_LOCAL_MA CHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFo lder)</WindowsSdkDir> | 15 <WindowsSdkDir Condition="'$(WindowsSdkDir)' == ''">$(Registry:HKEY_LOCAL_MA CHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFo lder)</WindowsSdkDir> |
16 | 16 |
17 <FrameworkDir Condition="'$(UseEnv)' != 'true'">$(Registry:HKEY_LOCAL_MACHIN E\SOFTWARE\Microsoft\.NETFramework@InstallRoot)</FrameworkDir> | 17 <FrameworkDir Condition="'$(UseEnv)' != 'true'">$(Registry:HKEY_LOCAL_MACHIN E\SOFTWARE\Microsoft\.NETFramework@InstallRoot)</FrameworkDir> |
18 <FrameworkDir Condition="'$(FrameworkDir)' == ''">$(Registry:HKEY_LOCAL_MACH INE\SOFTWARE\Wow6432Node\Microsoft\.NETFramework@InstallRoot)</FrameworkDir> | 18 <FrameworkDir Condition="'$(FrameworkDir)' == ''">$(Registry:HKEY_LOCAL_MACH INE\SOFTWARE\Wow6432Node\Microsoft\.NETFramework@InstallRoot)</FrameworkDir> |
19 | 19 |
20 <FrameworkSdkDir Condition="'$(UseEnv)' != 'true'">$(Registry:HKEY_LOCAL_MAC HINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)</Framew orkSdkDir> | 20 <FrameworkSdkDir Condition="'$(UseEnv)' != 'true'">$(Registry:HKEY_LOCAL_MAC HINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)</Framew orkSdkDir> |
21 <FrameworkSdkDir Condition="'$(FrameworkSdkDir)' == ''">$(Registry:HKEY_LOCA L_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v7.0A@Installati onFolder)</FrameworkSdkDir> | 21 <FrameworkSdkDir Condition="'$(FrameworkSdkDir)' == ''">$(Registry:HKEY_LOCA L_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v7.0A@Installati onFolder)</FrameworkSdkDir> |
22 | 22 |
23 <ExecutablePath Condition="'$(ExecutablePath)' == ''">$(PATH);</ExecutablePa th> | 23 <ExecutablePath Condition="'$(ExecutablePath)' == ''">$(PATH);</ExecutablePa th> |
24 <IncludePath Condition="'$(IncludePath)' == ''">$(VSNaClSDKRoot)include;</In cludePath> | 24 <IncludePath Condition="'$(IncludePath)' == ''">$(VSNaClSDKRoot)include;</In cludePath> |
25 <LibraryPath Condition="'$(LibraryPath)' == '' AND '$(TargetArchitecture)'== 'i686'">$(VSNaClSDKRoot)lib32;</LibraryPath> | 25 <LibraryPath Condition="'$(LibraryPath)' == '' AND '$(TargetArchitecture)'== 'i686'">$(VSNaClSDKRoot)lib\$(ToolchainName)_x86_32\$(Configuration);</LibraryPa th> |
binji
2013/11/19 21:57:16
I don't fully understand this, but it looks like i
Sam Clegg
2013/11/19 23:21:24
This is just setting the default library path, yes
| |
26 <LibraryPath Condition="'$(LibraryPath)' == '' AND '$(TargetArchitecture)'== 'x86_64'">$(VSNaClSDKRoot)lib;</LibraryPath> | 26 <LibraryPath Condition="'$(LibraryPath)' == '' AND '$(TargetArchitecture)'== 'x86_64'">$(VSNaClSDKRoot)lib\$(ToolchainName)_x86_64\$(Configuration);</Library Path> |
27 <LibraryPath Condition="'$(LibraryPath)' == '' AND '$(TargetArchitecture)'== 'arm'">$(VSNaClSDKRoot)lib\$(ToolchainName)_arm\$(Configuration);</LibraryPath> | |
28 <LibraryPath Condition="'$(LibraryPath)' == '' AND '$(TargetArchitecture)'== 'pnacl'">$(VSNaClSDKRoot)lib\pnacl\$(Configuration);</LibraryPath> | |
27 | 29 |
28 </PropertyGroup> | 30 </PropertyGroup> |
29 </Project> | 31 </Project> |
OLD | NEW |