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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified 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, 2 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 side-by-side diff with in-line comments
Download patch
« 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')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: visual_studio/NativeClientVSAddIn/InstallerResources/examples/hello_world_gles/hello_world_gles/hello_world_gles.vcxproj
diff --git a/visual_studio/NativeClientVSAddIn/InstallerResources/examples/hello_world_gles/hello_world_gles/hello_world_gles.vcxproj b/visual_studio/NativeClientVSAddIn/InstallerResources/examples/hello_world_gles/hello_world_gles/hello_world_gles.vcxproj
index 3290d5bc8e1f2c4d07275e5313d5238b19673c52..c0716d4ebb2ec1aef64d306096540ccd98e38773 100644
--- a/visual_studio/NativeClientVSAddIn/InstallerResources/examples/hello_world_gles/hello_world_gles/hello_world_gles.vcxproj
+++ b/visual_studio/NativeClientVSAddIn/InstallerResources/examples/hello_world_gles/hello_world_gles/hello_world_gles.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|NaCl32">
@@ -50,40 +50,21 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|NaCl64'">
<NaClAddInVersion>1</NaClAddInVersion>
- <VSNaClSDKRoot>$(NACL_SDK_ROOT)\</VSNaClSDKRoot>
- <IncludePath>$(VSNaClSDKRoot)include;</IncludePath>
- <LibraryPath>$(VSNaClSDKRoot)lib;</LibraryPath>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|NaCl32'">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PPAPI'">
<NaClAddInVersion>1</NaClAddInVersion>
- <VSNaClSDKRoot>$(NACL_SDK_ROOT)\</VSNaClSDKRoot>
- <IncludePath>$(VSNaClSDKRoot)include;</IncludePath>
- <LibraryPath>$(VSNaClSDKRoot)lib;</LibraryPath>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl64'">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PPAPI'">
<NaClAddInVersion>1</NaClAddInVersion>
- <VSNaClSDKRoot>$(NACL_SDK_ROOT)\</VSNaClSDKRoot>
- <IncludePath>$(VSNaClSDKRoot)include;</IncludePath>
- <LibraryPath>$(VSNaClSDKRoot)lib;</LibraryPath>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl32'">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl64'">
<NaClAddInVersion>1</NaClAddInVersion>
- <VSNaClSDKRoot>$(NACL_SDK_ROOT)\</VSNaClSDKRoot>
- <IncludePath>$(VSNaClSDKRoot)include;</IncludePath>
- <LibraryPath>$(VSNaClSDKRoot)lib;</LibraryPath>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PPAPI'">
- <ExecutablePath>$(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(WindowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bin;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|NaCl32'">
<NaClAddInVersion>1</NaClAddInVersion>
- <LinkIncremental>false</LinkIncremental>
- <IncludePath>$(VSNaClSDKRoot)include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
- <LibraryPath>$(VSNaClSDKRoot)lib\win_x86_32_host\$(Configuration);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PPAPI'">
- <ExecutablePath>$(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(WindowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bin;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl32'">
<NaClAddInVersion>1</NaClAddInVersion>
- <IncludePath>$(VSNaClSDKRoot)include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
- <LibraryPath>$(VSNaClSDKRoot)lib\win_x86_32_host\$(Configuration);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|NaCl64'">
<Link>
@@ -145,4 +126,4 @@ python.exe "$(VSNaClSDKRoot)\tools\create_nmf.py" -D "$(VSNaClSDKRoot)\toolchain
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
« 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