visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/ImportAfter/PPAPI.override.props - Issue 10831030: NaCl settings and completed install scripts.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side 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, 4 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

« visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/Properties/nacl_general.xml ('K') | « visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/Properties/nacl_projectItemsSchema.xml ('k') | visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/Microsoft.Cpp.[platform].default.props.patch » ('j') | visual_studio/NativeClientVSAddIn/InstallerResources/create_ppapi_platform.py » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">	1 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

2 <ItemDefinitionGroup>	2 <ItemDefinitionGroup>

3 <ClCompile>	3 <ClCompile>

4 <!-- add PPAPI preprocessor -->	4 <!-- add PPAPI preprocessor -->

5 <PreprocessorDefinitions>PPAPI;%(PreprocessorDefinitions)</PreprocessorDef initions>	5 <PreprocessorDefinitions>PPAPI;%(PreprocessorDefinitions)</PreprocessorDef initions>

6 </ClCompile>	6 </ClCompile>

7 </ItemDefinitionGroup>	7 </ItemDefinitionGroup>

8	8

9 <!-- Set the run-time library to the non-DLL versions to match Chrome. -->	9 <!-- Set the run-time library to the non-DLL versions to match Chrome. -->

10 <ItemDefinitionGroup>	10 <ItemDefinitionGroup>

11 <ClCompile>	11 <ClCompile>

12 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>	12 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

13 </ClCompile>	13 </ClCompile>

14 </ItemDefinitionGroup>	14 </ItemDefinitionGroup>

15 <ItemDefinitionGroup Condition="'$(Configuration)' == 'Debug'">	15 <ItemDefinitionGroup Condition="'$(Configuration)' == 'Debug'">

16 <ClCompile>	16 <ClCompile>

17 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>	17 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

18 </ClCompile>	18 </ClCompile>

19 </ItemDefinitionGroup>	19 </ItemDefinitionGroup>

20	20

21 <!-- Add the Pepper static libraries -->	21 <!-- Add the Pepper static libraries, change output file -->

22 <ItemDefinitionGroup>	22 <ItemDefinitionGroup>

23 <Link>	23 <Link>

24 <AdditionalDependencies>ppapi_cpp.lib;ppapi.lib;%(AdditionalDependencies)< /AdditionalDependencies>	24 <AdditionalDependencies>ppapi_cpp.lib;ppapi.lib;</AdditionalDependencies>

	25 <OutputFile>$(TargetDir)$(TargetName)$(TargetExt)</OutputFile>

25 </Link>	26 </Link>

26 </ItemDefinitionGroup>	27 </ItemDefinitionGroup>

27	28

28 <!-- setup default debugging parameters -->	29 <!-- setup default debugging parameters -->

29 <PropertyGroup>	30 <PropertyGroup>

30 <LocalDebuggerCommand>$(CHROME_PATH)\chrome.exe</LocalDebuggerCommand>	31 <LocalDebuggerCommand>$(CHROME_PATH)\chrome.exe</LocalDebuggerCommand>

31 <LocalDebuggerCommandArguments>--register-pepper-plugins="$(TargetPath)";app lication/x-nacl localhost:5103</LocalDebuggerCommandArguments>	32 <LocalDebuggerCommandArguments>--register-pepper-plugins="$(TargetPath)";app lication/x-nacl localhost:5103</LocalDebuggerCommandArguments>

32 </PropertyGroup>	33 </PropertyGroup>

33 </Project>	34 </Project>

OLD	NEW