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

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 10928194: explicitly set VSNaClSDKRoot in vcxproj rather than (Closed) Base URL: http://nativeclient-sdk.googlecode.com/svn/trunk/src
Patch Set: Created 8 years, 3 months 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 | « no previous file | visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/Connect.cs » ('j') | no next file with comments »
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|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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condit ion="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="Local AppDataPlatform" /> 60 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condit ion="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="Local AppDataPlatform" />
61 </ImportGroup> 61 </ImportGroup>
62 <PropertyGroup Label="UserMacros" /> 62 <PropertyGroup Label="UserMacros" />
63 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 63 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
64 <LinkIncremental>true</LinkIncremental> 64 <LinkIncremental>true</LinkIncremental>
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 <NaClIrtPath>$(VSNaClSDKRoot)\tools\irt_x86_64.nexe</NaClIrtPath>
71 <NaClAddInVersion>1.0.4632.27091</NaClAddInVersion>
72 <VSNaClSDKRoot>$(NACL_SDK_ROOT)\</VSNaClSDKRoot>
73 <OutDir>$(ProjectDir)$(ToolchainName)\</OutDir>
74 <IntDir>$(ToolchainName)\$(Configuration)\</IntDir>
70 <IncludePath>$(VSNaClSDKRoot)include;</IncludePath> 75 <IncludePath>$(VSNaClSDKRoot)include;</IncludePath>
71 <LibraryPath>$(VSNaClSDKRoot)lib;</LibraryPath> 76 <LibraryPath>$(VSNaClSDKRoot)lib;</LibraryPath>
77 </PropertyGroup>
78 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl'">
72 <NaClIrtPath>$(VSNaClSDKRoot)\tools\irt_x86_64.nexe</NaClIrtPath> 79 <NaClIrtPath>$(VSNaClSDKRoot)\tools\irt_x86_64.nexe</NaClIrtPath>
80 <NaClAddInVersion>1.0.4632.27091</NaClAddInVersion>
81 <VSNaClSDKRoot>$(NACL_SDK_ROOT)\</VSNaClSDKRoot>
73 <OutDir>$(ProjectDir)$(ToolchainName)\</OutDir> 82 <OutDir>$(ProjectDir)$(ToolchainName)\</OutDir>
74 <IntDir>$(ToolchainName)\$(Configuration)\</IntDir> 83 <IntDir>$(ToolchainName)\$(Configuration)\</IntDir>
75 <NaClAddInVersion>1.0.4632.27091</NaClAddInVersion>
76 </PropertyGroup>
77 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl'">
78 <IncludePath>$(VSNaClSDKRoot)include;</IncludePath> 84 <IncludePath>$(VSNaClSDKRoot)include;</IncludePath>
79 <LibraryPath>$(VSNaClSDKRoot)lib;</LibraryPath> 85 <LibraryPath>$(VSNaClSDKRoot)lib;</LibraryPath>
80 <NaClIrtPath>$(VSNaClSDKRoot)\tools\irt_x86_64.nexe</NaClIrtPath>
81 <OutDir>$(ProjectDir)$(ToolchainName)\</OutDir>
82 <IntDir>$(ToolchainName)\$(Configuration)\</IntDir>
83 <NaClAddInVersion>1.0.4632.27091</NaClAddInVersion>
84 </PropertyGroup> 86 </PropertyGroup>
85 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PPAPI'"> 87 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PPAPI'">
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>
89 <NaClAddInVersion>1.0.4632.27091</NaClAddInVersion>
86 <IncludePath>$(VSNaClSDKRoot)include;$(VCInstallDir)include;$(VCInstallDir)a tlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath> 90 <IncludePath>$(VSNaClSDKRoot)include;$(VCInstallDir)include;$(VCInstallDir)a tlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
87 <LibraryPath>$(VSNaClSDKRoot)lib\win_x86_32_host\$(Configuration);$(VCInstal lDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</L ibraryPath> 91 <LibraryPath>$(VSNaClSDKRoot)lib\win_x86_32_host\$(Configuration);$(VCInstal lDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</L ibraryPath>
92 </PropertyGroup>
93 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PPAPI'">
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> 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>
89 <NaClAddInVersion>1.0.4632.27091</NaClAddInVersion> 95 <NaClAddInVersion>1.0.4632.27091</NaClAddInVersion>
90 </PropertyGroup>
91 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PPAPI'">
92 <IncludePath>$(VSNaClSDKRoot)include;$(VCInstallDir)include;$(VCInstallDir)a tlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath> 96 <IncludePath>$(VSNaClSDKRoot)include;$(VCInstallDir)include;$(VCInstallDir)a tlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
93 <LibraryPath>$(VSNaClSDKRoot)lib\win_x86_32_host\$(Configuration);$(VCInstal lDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</L ibraryPath> 97 <LibraryPath>$(VSNaClSDKRoot)lib\win_x86_32_host\$(Configuration);$(VCInstal lDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</L ibraryPath>
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>
95 <NaClAddInVersion>1.0.4632.27091</NaClAddInVersion>
96 </PropertyGroup> 98 </PropertyGroup>
97 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" > 99 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" >
98 <ClCompile> 100 <ClCompile>
99 <PrecompiledHeader> 101 <PrecompiledHeader>
100 </PrecompiledHeader> 102 </PrecompiledHeader>
101 <WarningLevel>Level3</WarningLevel> 103 <WarningLevel>Level3</WarningLevel>
102 <Optimization>Disabled</Optimization> 104 <Optimization>Disabled</Optimization>
103 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;HELLO_WORLD_GLES_EX PORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 105 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;HELLO_WORLD_GLES_EX PORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
104 </ClCompile> 106 </ClCompile>
105 <Link> 107 <Link>
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 <ItemGroup> 163 <ItemGroup>
162 <ClCompile Include="hello_world.cc" /> 164 <ClCompile Include="hello_world.cc" />
163 <ClCompile Include="matrix.cc" /> 165 <ClCompile Include="matrix.cc" />
164 </ItemGroup> 166 </ItemGroup>
165 <ItemGroup> 167 <ItemGroup>
166 <ClInclude Include="matrix.h" /> 168 <ClInclude Include="matrix.h" />
167 </ItemGroup> 169 </ItemGroup>
168 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 170 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
169 <ImportGroup Label="ExtensionTargets"> 171 <ImportGroup Label="ExtensionTargets">
170 </ImportGroup> 172 </ImportGroup>
171 </Project> 173 </Project>
OLDNEW
« no previous file with comments | « no previous file | visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/Connect.cs » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698