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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/PlatformToolsets/v100/microsoft.cpp.[platform].v100.props.patch

Issue 11085093: Remove windows lines endings (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/Microsoft.Cpp.[platform].targets.patch ('k') | visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/PlatformToolsets/v100/microsoft.cpp.[platform].v100.targets.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/PlatformToolsets/v100/microsoft.cpp.[platform].v100.props.patch
diff --git a/visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/PlatformToolsets/v100/microsoft.cpp.[platform].v100.props.patch b/visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/PlatformToolsets/v100/microsoft.cpp.[platform].v100.props.patch
index 1492c63caea061b442d7689e1dd3c8325a4a8615..d690b0e9beedc4af7d294fdf261ed53a23c75ded 100644
--- a/visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/PlatformToolsets/v100/microsoft.cpp.[platform].v100.props.patch
+++ b/visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/PlatformToolsets/v100/microsoft.cpp.[platform].v100.props.patch
@@ -1,31 +1,31 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PatchRemove>
- <Import Project="$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v100\ImportBefore\*.props" Condition="Exists('$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v100\ImportBefore')" />
- </PatchRemove>
- <PatchAdd>
- <Import Project="$(VCTargetsPath)\Platforms\PPAPI\PlatformToolsets\v100\ImportBefore\*.props" Condition="Exists('$(VCTargetsPath)\Platforms\PPAPI\PlatformToolsets\v100\ImportBefore')" />
- </PatchAdd>
-
- <PropertyGroup>
- <!-- added NaCl include and lib information -->
- <PatchRemove>
- <IncludePath Condition="'$(IncludePath)' == ''">$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
- </PatchRemove>
- <PatchAdd>
- <IncludePath Condition="'$(IncludePath)' == ''">$(VSNaClSDKRoot)include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
- </PatchAdd>
- <PatchRemove>
- <LibraryPath Condition="'$(LibraryPath)' == ''">$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath>
- </PatchRemove>
- <PatchAdd>
- <LibraryPath Condition="'$(LibraryPath)' == ''">$(VSNaClSDKRoot)lib\win_x86_32_host\$(Configuration);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath>
- </PatchAdd>
- </PropertyGroup>
-
- <PatchRemove>
- <Import Project="$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v100\ImportAfter\*.props" Condition="Exists('$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v100\ImportAfter')" />
- </PatchRemove>
- <PatchAdd>
- <Import Project="$(VCTargetsPath)\Platforms\PPAPI\PlatformToolsets\v100\ImportAfter\*.props" Condition="Exists('$(VCTargetsPath)\Platforms\PPAPI\PlatformToolsets\v100\ImportAfter')" />
- </PatchAdd>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PatchRemove>
+ <Import Project="$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v100\ImportBefore\*.props" Condition="Exists('$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v100\ImportBefore')" />
+ </PatchRemove>
+ <PatchAdd>
+ <Import Project="$(VCTargetsPath)\Platforms\PPAPI\PlatformToolsets\v100\ImportBefore\*.props" Condition="Exists('$(VCTargetsPath)\Platforms\PPAPI\PlatformToolsets\v100\ImportBefore')" />
+ </PatchAdd>
+
+ <PropertyGroup>
+ <!-- added NaCl include and lib information -->
+ <PatchRemove>
+ <IncludePath Condition="'$(IncludePath)' == ''">$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
+ </PatchRemove>
+ <PatchAdd>
+ <IncludePath Condition="'$(IncludePath)' == ''">$(VSNaClSDKRoot)include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
+ </PatchAdd>
+ <PatchRemove>
+ <LibraryPath Condition="'$(LibraryPath)' == ''">$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath>
+ </PatchRemove>
+ <PatchAdd>
+ <LibraryPath Condition="'$(LibraryPath)' == ''">$(VSNaClSDKRoot)lib\win_x86_32_host\$(Configuration);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath>
+ </PatchAdd>
+ </PropertyGroup>
+
+ <PatchRemove>
+ <Import Project="$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v100\ImportAfter\*.props" Condition="Exists('$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v100\ImportAfter')" />
+ </PatchRemove>
+ <PatchAdd>
+ <Import Project="$(VCTargetsPath)\Platforms\PPAPI\PlatformToolsets\v100\ImportAfter\*.props" Condition="Exists('$(VCTargetsPath)\Platforms\PPAPI\PlatformToolsets\v100\ImportAfter')" />
+ </PatchAdd>
</Project>
« no previous file with comments | « visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/Microsoft.Cpp.[platform].targets.patch ('k') | visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/PlatformToolsets/v100/microsoft.cpp.[platform].v100.targets.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698