| OLD | NEW |
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microso
ft.com/developer/msbuild/2003"> | 2 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microso
ft.com/developer/msbuild/2003"> |
| 3 <ItemGroup Label="ProjectConfigurations"> | 3 <ItemGroup Label="ProjectConfigurations"> |
| 4 <ProjectConfiguration Include="Debug|NaCl"> | 4 <ProjectConfiguration Include="Debug|NaCl"> |
| 5 <Configuration>Debug</Configuration> | 5 <Configuration>Debug</Configuration> |
| 6 <Platform>NaCl</Platform> | 6 <Platform>NaCl</Platform> |
| 7 </ProjectConfiguration> | 7 </ProjectConfiguration> |
| 8 <ProjectConfiguration Include="Debug|PPAPI"> | 8 <ProjectConfiguration Include="Debug|PPAPI"> |
| 9 <Configuration>Debug</Configuration> | 9 <Configuration>Debug</Configuration> |
| 10 <Platform>PPAPI</Platform> | 10 <Platform>PPAPI</Platform> |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 </PropertyGroup> | 65 </PropertyGroup> |
| 66 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | 66 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
| 67 <LinkIncremental>false</LinkIncremental> | 67 <LinkIncremental>false</LinkIncremental> |
| 68 </PropertyGroup> | 68 </PropertyGroup> |
| 69 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|NaCl'"> | 69 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|NaCl'"> |
| 70 <IncludePath>$(VSNaClSDKRoot)include;</IncludePath> | 70 <IncludePath>$(VSNaClSDKRoot)include;</IncludePath> |
| 71 <LibraryPath>$(VSNaClSDKRoot)lib;</LibraryPath> | 71 <LibraryPath>$(VSNaClSDKRoot)lib;</LibraryPath> |
| 72 <NaClIrtPath>$(VSNaClSDKRoot)\tools\irt_x86_64.nexe</NaClIrtPath> | 72 <NaClIrtPath>$(VSNaClSDKRoot)\tools\irt_x86_64.nexe</NaClIrtPath> |
| 73 <OutDir>$(ProjectDir)$(ToolchainName)\</OutDir> | 73 <OutDir>$(ProjectDir)$(ToolchainName)\</OutDir> |
| 74 <IntDir>$(ToolchainName)\$(Configuration)\</IntDir> | 74 <IntDir>$(ToolchainName)\$(Configuration)\</IntDir> |
| 75 <NaClAddInVersion>1.0.4611.21610</NaClAddInVersion> | 75 <NaClAddInVersion>1.0.4632.27091</NaClAddInVersion> |
| 76 <VSNaClSDKRoot>D:\private_svn\src\\chrome_clean\src\out\pepper_23</VSNaClSDK
Root> | |
| 77 </PropertyGroup> | 76 </PropertyGroup> |
| 78 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl'"> | 77 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl'"> |
| 79 <IncludePath>$(VSNaClSDKRoot)include;</IncludePath> | 78 <IncludePath>$(VSNaClSDKRoot)include;</IncludePath> |
| 80 <LibraryPath>$(VSNaClSDKRoot)lib;</LibraryPath> | 79 <LibraryPath>$(VSNaClSDKRoot)lib;</LibraryPath> |
| 81 <NaClIrtPath>$(VSNaClSDKRoot)\tools\irt_x86_64.nexe</NaClIrtPath> | 80 <NaClIrtPath>$(VSNaClSDKRoot)\tools\irt_x86_64.nexe</NaClIrtPath> |
| 82 <OutDir>$(ProjectDir)$(ToolchainName)\</OutDir> | 81 <OutDir>$(ProjectDir)$(ToolchainName)\</OutDir> |
| 83 <IntDir>$(ToolchainName)\$(Configuration)\</IntDir> | 82 <IntDir>$(ToolchainName)\$(Configuration)\</IntDir> |
| 84 <NaClAddInVersion>1.0.4611.21610</NaClAddInVersion> | 83 <NaClAddInVersion>1.0.4632.27091</NaClAddInVersion> |
| 85 </PropertyGroup> | 84 </PropertyGroup> |
| 86 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PPAPI'"> | 85 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PPAPI'"> |
| 87 <IncludePath>$(VSNaClSDKRoot)include;$(VCInstallDir)include;$(VCInstallDir)a
tlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath> | 86 <IncludePath>$(VSNaClSDKRoot)include;$(VCInstallDir)include;$(VCInstallDir)a
tlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath> |
| 88 <LibraryPath>$(VSNaClSDKRoot)lib\win_x86_32_host\$(Configuration);$(VCInstal
lDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</L
ibraryPath> | 87 <LibraryPath>$(VSNaClSDKRoot)lib\win_x86_32_host\$(Configuration);$(VCInstal
lDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</L
ibraryPath> |
| 89 <ExecutablePath>$(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(Win
dowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(V
SInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bi
n;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PAT
H);</ExecutablePath> | 88 <ExecutablePath>$(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(Win
dowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(V
SInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bi
n;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PAT
H);</ExecutablePath> |
| 90 <NaClAddInVersion>1.0.4611.21610</NaClAddInVersion> | 89 <NaClAddInVersion>1.0.4632.27091</NaClAddInVersion> |
| 91 </PropertyGroup> | 90 </PropertyGroup> |
| 92 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PPAPI'"> | 91 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PPAPI'"> |
| 93 <IncludePath>$(VSNaClSDKRoot)include;$(VCInstallDir)include;$(VCInstallDir)a
tlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath> | 92 <IncludePath>$(VSNaClSDKRoot)include;$(VCInstallDir)include;$(VCInstallDir)a
tlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath> |
| 94 <LibraryPath>$(VSNaClSDKRoot)lib\win_x86_32_host\$(Configuration);$(VCInstal
lDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</L
ibraryPath> | 93 <LibraryPath>$(VSNaClSDKRoot)lib\win_x86_32_host\$(Configuration);$(VCInstal
lDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</L
ibraryPath> |
| 95 <ExecutablePath>$(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(Win
dowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(V
SInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bi
n;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PAT
H);</ExecutablePath> | 94 <ExecutablePath>$(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(Win
dowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(V
SInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bi
n;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PAT
H);</ExecutablePath> |
| 96 <NaClAddInVersion>1.0.4611.21610</NaClAddInVersion> | 95 <NaClAddInVersion>1.0.4632.27091</NaClAddInVersion> |
| 97 </PropertyGroup> | 96 </PropertyGroup> |
| 98 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"
> | 97 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"
> |
| 99 <ClCompile> | 98 <ClCompile> |
| 100 <PrecompiledHeader> | 99 <PrecompiledHeader> |
| 101 </PrecompiledHeader> | 100 </PrecompiledHeader> |
| 102 <WarningLevel>Level3</WarningLevel> | 101 <WarningLevel>Level3</WarningLevel> |
| 103 <Optimization>Disabled</Optimization> | 102 <Optimization>Disabled</Optimization> |
| 104 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;HELLO_WORLD_GLES_EX
PORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 103 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;HELLO_WORLD_GLES_EX
PORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 105 </ClCompile> | 104 </ClCompile> |
| 106 <Link> | 105 <Link> |
| (...skipping 19 matching lines...) Expand all Loading... |
| 126 </Link> | 125 </Link> |
| 127 </ItemDefinitionGroup> | 126 </ItemDefinitionGroup> |
| 128 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|NaCl'"> | 127 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|NaCl'"> |
| 129 <Link> | 128 <Link> |
| 130 <AdditionalDependencies>ppapi;ppapi_gles2</AdditionalDependencies> | 129 <AdditionalDependencies>ppapi;ppapi_gles2</AdditionalDependencies> |
| 131 <OutputFile>$(TargetDir)$(TargetName)_$(TargetArchitecture)$(TargetExt)</O
utputFile> | 130 <OutputFile>$(TargetDir)$(TargetName)_$(TargetArchitecture)$(TargetExt)</O
utputFile> |
| 132 </Link> | 131 </Link> |
| 133 <PostBuildEvent> | 132 <PostBuildEvent> |
| 134 <Command>set PATH=$(Path) | 133 <Command>set PATH=$(Path) |
| 135 python.exe $(VSNaClSDKRoot)\tools\create_nmf.py -D $(VSNaClSDKRoot)\toolchain\wi
n_x86_$(ToolchainName)\bin\x86_64-nacl-objdump.exe -L $(VSNaClSDKRoot)\toolchain
\win_x86_$(ToolchainName)\x86_64-nacl\lib -L $(VSNaClSDKRoot)\toolchain\win_x86_
$(ToolchainName)\x86_64-nacl\lib32 -o $(ToolchainName)\hello_world_gles.nmf -t $
(ToolchainName) -s $(ToolchainName) $(TargetDir)$(TargetName)_$(TargetArchitectu
re)$(TargetExt)</Command> | 134 python.exe $(VSNaClSDKRoot)\tools\create_nmf.py -D $(VSNaClSDKRoot)\toolchain\wi
n_x86_$(ToolchainName)\bin\x86_64-nacl-objdump.exe -L $(VSNaClSDKRoot)\toolchain
\win_x86_$(ToolchainName)\x86_64-nacl\lib -L $(VSNaClSDKRoot)\toolchain\win_x86_
$(ToolchainName)\x86_64-nacl\lib32 -o $(ToolchainName)\hello_world_gles.nmf -t $
(ToolchainName) -s $(ToolchainName) $(TargetDir)$(TargetName)_$(TargetArchitectu
re)$(TargetExt)</Command> |
| 135 <Message>Running 'create_nmf'</Message> |
| 136 </PostBuildEvent> | 136 </PostBuildEvent> |
| 137 </ItemDefinitionGroup> | 137 </ItemDefinitionGroup> |
| 138 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl'
"> | 138 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl'
"> |
| 139 <Link> | 139 <Link> |
| 140 <AdditionalDependencies>ppapi;ppapi_gles2</AdditionalDependencies> | 140 <AdditionalDependencies>ppapi;ppapi_gles2</AdditionalDependencies> |
| 141 </Link> | 141 </Link> |
| 142 </ItemDefinitionGroup> | 142 </ItemDefinitionGroup> |
| 143 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PPAPI'"
> | 143 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PPAPI'"
> |
| 144 <Link> | 144 <Link> |
| 145 <AdditionalDependencies>ppapi.lib;ppapi_gles2.lib;</AdditionalDependencies
> | 145 <AdditionalDependencies>ppapi.lib;ppapi_gles2.lib;</AdditionalDependencies
> |
| (...skipping 15 matching lines...) Expand all Loading... |
| 161 <ItemGroup> | 161 <ItemGroup> |
| 162 <ClCompile Include="hello_world.cc" /> | 162 <ClCompile Include="hello_world.cc" /> |
| 163 <ClCompile Include="matrix.cc" /> | 163 <ClCompile Include="matrix.cc" /> |
| 164 </ItemGroup> | 164 </ItemGroup> |
| 165 <ItemGroup> | 165 <ItemGroup> |
| 166 <ClInclude Include="matrix.h" /> | 166 <ClInclude Include="matrix.h" /> |
| 167 </ItemGroup> | 167 </ItemGroup> |
| 168 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 168 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 169 <ImportGroup Label="ExtensionTargets"> | 169 <ImportGroup Label="ExtensionTargets"> |
| 170 </ImportGroup> | 170 </ImportGroup> |
| 171 </Project> | 171 </Project> |
| OLD | NEW |