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

Unified Diff: visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/V110/Microsoft.Cpp.Win32.default.props.patch

Issue 14122017: [VS Addin] Add visual studio 2012 support (Closed) Base URL: https://nativeclient-sdk.googlecode.com/svn/trunk/src
Patch Set: Created 7 years, 6 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
Index: visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/V110/Microsoft.Cpp.Win32.default.props.patch
diff --git a/visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/Microsoft.Cpp.[platform].default.props.patch b/visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/V110/Microsoft.Cpp.Win32.default.props.patch
similarity index 59%
rename from visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/Microsoft.Cpp.[platform].default.props.patch
rename to visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/V110/Microsoft.Cpp.Win32.default.props.patch
index 9995d6584d1cf5ccfbf3a38829e1b4222153c5ff..e50220825198d1ae0a9163e11f5282efcda7fbc8 100644
--- a/visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/Microsoft.Cpp.[platform].default.props.patch
+++ b/visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/V110/Microsoft.Cpp.Win32.default.props.patch
@@ -7,18 +7,7 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset Condition="'$(PlatformToolset)' == ''">$(DefaultPPAPIPlatformToolset)</PlatformToolset>
</PatchAdd>
- <PatchRemove>
- <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'==''">$(Configuration)\</IntDir>
- </PatchRemove>
- <PatchAdd>
- <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'==''">win\$(Configuration)\</IntDir>
- </PatchAdd>
- <PatchRemove>
- <OutDir Condition="'$(OutDir)'=='' AND '$(SolutionDir)' != ''">$(SolutionDir)$(Configuration)\</OutDir>
- </PatchRemove>
- <PatchAdd>
- <OutDir Condition="'$(OutDir)'=='' AND '$(SolutionDir)' != ''">$(ProjectDir)win\</OutDir>
- </PatchAdd>
+
<PatchAdd>
<VSNaClSDKRoot Condition="'$(VSNaClSDKRoot)'==''">$(NACL_SDK_ROOT)\</VSNaClSDKRoot>
<NaClWebServerPort Condition="'$(NaClWebServerPort)'==''">5103</NaClWebServerPort>
@@ -26,4 +15,4 @@
<UseDebugLibraries Condition="'$(Configuration)' == 'Debug'">true</UseDebugLibraries>
</PatchAdd>
</PropertyGroup>
-</Project>
+</Project>

Powered by Google App Engine
This is Rietveld 408576698