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

Unified Diff: visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/ImportAfter/PPAPI.override.props

Issue 10831030: NaCl settings and completed install scripts. (Closed) Base URL: https://nativeclient-sdk.googlecode.com/svn/trunk/src
Patch Set: Created 8 years, 5 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/ImportAfter/PPAPI.override.props
diff --git a/visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/ImportAfter/PPAPI.override.props b/visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/ImportAfter/PPAPI.override.props
index 847dd152598a677be32645f2c76618020fc78d69..38454a69ce55e723c727b931e95a2930a85bba32 100644
--- a/visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/ImportAfter/PPAPI.override.props
+++ b/visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/ImportAfter/PPAPI.override.props
@@ -15,19 +15,36 @@
<ItemDefinitionGroup Condition="'$(Configuration)' == 'Debug'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <Optimization>Disabled</Optimization>
+ <MinimalRebuild>true</MinimalRebuild>
</ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)' == 'Release'">
+ <Link>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
+ </Link>
</ItemDefinitionGroup>
- <!-- Add the Pepper static libraries -->
+ <!-- Add the Pepper static libraries, change output file -->
<ItemDefinitionGroup>
<Link>
<AdditionalDependencies>ppapi_cpp.lib;ppapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(TargetDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<!-- setup default debugging parameters -->
<PropertyGroup>
- <LocalDebuggerCommand>$(CHROME_PATH)\chrome.exe</LocalDebuggerCommand>
- <LocalDebuggerCommandArguments>--register-pepper-plugins="$(TargetPath)";application/x-nacl localhost:5103</LocalDebuggerCommandArguments>
+ <LocalDebuggerCommand>$(CHROME_PATH)</LocalDebuggerCommand>
+ <LocalDebuggerCommandArguments Condition="$(Configuration) == 'Debug'">--register-pepper-plugins="$(TargetPath)";application/x-nacl localhost:5103 --wait-for-debugger-children</LocalDebuggerCommandArguments>
+ <LocalDebuggerCommandArguments Condition="$(Configuration) != 'Debug'">--register-pepper-plugins="$(TargetPath)";application/x-nacl localhost:5103</LocalDebuggerCommandArguments>
+
+ <LinkIncremental Condition="$(Configuration) == 'Debug'">true</LinkIncremental>
+ <LinkIncremental Condition="$(Configuration) != 'Debug'">false</LinkIncremental>
</PropertyGroup>
</Project>

Powered by Google App Engine
This is Rietveld 408576698