Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(202)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: visual_studio/NativeClientVSAddIn/InstallerResources/examples/hello_world_gles/hello_world_gles/hello_world_gles.vcxproj

Issue 11225037: [NaCl SDK] move VSNaClSDKRoot into ConfigurationGeneral section (Closed) Base URL: http://nativeclient-sdk.googlecode.com/svn/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/Props/ppapi_general.xml.patch ('k') | visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/Connect.cs » ('j') | visual_studio/NativeClientVSAddIn/UnitTests/ProjectSettingsTest.cs » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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|NaCl32"> 4 <ProjectConfiguration Include="Debug|NaCl32">
5 <Configuration>Debug</Configuration> 5 <Configuration>Debug</Configuration>
6 <Platform>NaCl32</Platform> 6 <Platform>NaCl32</Platform>
7 </ProjectConfiguration> 7 </ProjectConfiguration>
8 <ProjectConfiguration Include="Debug|NaCl64"> 8 <ProjectConfiguration Include="Debug|NaCl64">
9 <Configuration>Debug</Configuration> 9 <Configuration>Debug</Configuration>
10 <Platform>NaCl64</Platform> 10 <Platform>NaCl64</Platform>
11 </ProjectConfiguration> 11 </ProjectConfiguration>
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 </PropertyGroup> 43 </PropertyGroup>
44 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl32'" La bel="Configuration"> 44 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl32'" La bel="Configuration">
45 <ToolchainName>newlib</ToolchainName> 45 <ToolchainName>newlib</ToolchainName>
46 </PropertyGroup> 46 </PropertyGroup>
47 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 47 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
48 <ImportGroup Label="ExtensionSettings"> 48 <ImportGroup Label="ExtensionSettings">
49 </ImportGroup> 49 </ImportGroup>
50 <PropertyGroup Label="UserMacros" /> 50 <PropertyGroup Label="UserMacros" />
51 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|NaCl64'"> 51 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|NaCl64'">
52 <NaClAddInVersion>1</NaClAddInVersion> 52 <NaClAddInVersion>1</NaClAddInVersion>
53 <VSNaClSDKRoot>$(NACL_SDK_ROOT)\</VSNaClSDKRoot> 53 </PropertyGroup>
54 <IncludePath>$(VSNaClSDKRoot)include;</IncludePath> 54 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PPAPI'">
55 <LibraryPath>$(VSNaClSDKRoot)lib;</LibraryPath> 55 <NaClAddInVersion>1</NaClAddInVersion>
56 </PropertyGroup>
57 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PPAPI'">
58 <NaClAddInVersion>1</NaClAddInVersion>
59 </PropertyGroup>
60 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl64'">
61 <NaClAddInVersion>1</NaClAddInVersion>
56 </PropertyGroup> 62 </PropertyGroup>
57 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|NaCl32'"> 63 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|NaCl32'">
58 <NaClAddInVersion>1</NaClAddInVersion> 64 <NaClAddInVersion>1</NaClAddInVersion>
59 <VSNaClSDKRoot>$(NACL_SDK_ROOT)\</VSNaClSDKRoot>
60 <IncludePath>$(VSNaClSDKRoot)include;</IncludePath>
61 <LibraryPath>$(VSNaClSDKRoot)lib;</LibraryPath>
62 </PropertyGroup>
63 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl64'">
64 <NaClAddInVersion>1</NaClAddInVersion>
65 <VSNaClSDKRoot>$(NACL_SDK_ROOT)\</VSNaClSDKRoot>
66 <IncludePath>$(VSNaClSDKRoot)include;</IncludePath>
67 <LibraryPath>$(VSNaClSDKRoot)lib;</LibraryPath>
68 </PropertyGroup> 65 </PropertyGroup>
69 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl32'"> 66 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl32'">
70 <NaClAddInVersion>1</NaClAddInVersion> 67 <NaClAddInVersion>1</NaClAddInVersion>
71 <VSNaClSDKRoot>$(NACL_SDK_ROOT)\</VSNaClSDKRoot>
72 <IncludePath>$(VSNaClSDKRoot)include;</IncludePath>
73 <LibraryPath>$(VSNaClSDKRoot)lib;</LibraryPath>
74 </PropertyGroup>
75 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PPAPI'">
76 <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>
77 <NaClAddInVersion>1</NaClAddInVersion>
78 <LinkIncremental>false</LinkIncremental>
79 <IncludePath>$(VSNaClSDKRoot)include;$(VCInstallDir)include;$(VCInstallDir)a tlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
80 <LibraryPath>$(VSNaClSDKRoot)lib\win_x86_32_host\$(Configuration);$(VCInstal lDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</L ibraryPath>
81 </PropertyGroup>
82 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PPAPI'">
83 <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>
84 <NaClAddInVersion>1</NaClAddInVersion>
85 <IncludePath>$(VSNaClSDKRoot)include;$(VCInstallDir)include;$(VCInstallDir)a tlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
86 <LibraryPath>$(VSNaClSDKRoot)lib\win_x86_32_host\$(Configuration);$(VCInstal lDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</L ibraryPath>
87 </PropertyGroup> 68 </PropertyGroup>
88 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|NaCl64' "> 69 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|NaCl64' ">
89 <Link> 70 <Link>
90 <AdditionalDependencies>ppapi;ppapi_gles2</AdditionalDependencies> 71 <AdditionalDependencies>ppapi;ppapi_gles2</AdditionalDependencies>
91 </Link> 72 </Link>
92 <PostBuildEvent> 73 <PostBuildEvent>
93 <Command>set PATH=$(Path) 74 <Command>set PATH=$(Path)
94 mkdir $(ToolchainName) 75 mkdir $(ToolchainName)
95 python.exe "$(VSNaClSDKRoot)\tools\create_nmf.py" -D "$(VSNaClSDKRoot)\toolchain \win_x86_$(ToolchainName)\bin\x86_64-nacl-objdump.exe" -L "$(VSNaClSDKRoot)\tool chain\win_x86_$(ToolchainName)\x86_64-nacl\lib" -L "$(VSNaClSDKRoot)\toolchain\w in_x86_$(ToolchainName)\x86_64-nacl\lib32" -o $(ToolchainName)\hello_world_gles. nmf -t $(ToolchainName) -s $(ToolchainName) "$(TargetPath)"</Command> 76 python.exe "$(VSNaClSDKRoot)\tools\create_nmf.py" -D "$(VSNaClSDKRoot)\toolchain \win_x86_$(ToolchainName)\bin\x86_64-nacl-objdump.exe" -L "$(VSNaClSDKRoot)\tool chain\win_x86_$(ToolchainName)\x86_64-nacl\lib" -L "$(VSNaClSDKRoot)\toolchain\w in_x86_$(ToolchainName)\x86_64-nacl\lib32" -o $(ToolchainName)\hello_world_gles. nmf -t $(ToolchainName) -s $(ToolchainName) "$(TargetPath)"</Command>
96 <Message>Running 'create_nmf'</Message> 77 <Message>Running 'create_nmf'</Message>
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 <ItemGroup> 119 <ItemGroup>
139 <ClCompile Include="hello_world.cc" /> 120 <ClCompile Include="hello_world.cc" />
140 <ClCompile Include="matrix.cc" /> 121 <ClCompile Include="matrix.cc" />
141 </ItemGroup> 122 </ItemGroup>
142 <ItemGroup> 123 <ItemGroup>
143 <ClInclude Include="matrix.h" /> 124 <ClInclude Include="matrix.h" />
144 </ItemGroup> 125 </ItemGroup>
145 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 126 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
146 <ImportGroup Label="ExtensionTargets"> 127 <ImportGroup Label="ExtensionTargets">
147 </ImportGroup> 128 </ImportGroup>
148 </Project> 129 </Project>
OLDNEW
« no previous file with comments | « visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/Props/ppapi_general.xml.patch ('k') | visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/Connect.cs » ('j') | visual_studio/NativeClientVSAddIn/UnitTests/ProjectSettingsTest.cs » ('J')

Powered by Google App Engine
This is Rietveld 408576698