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

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

« no previous file with comments | « visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/Properties/nacl_projectItemsSchema.xml ('k') | visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/Microsoft.Cpp.[platform].default.props.patch » ('j') | no next file with comments »
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 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

	19 <Optimization>Disabled</Optimization>

	20 <MinimalRebuild>true</MinimalRebuild>

18 </ClCompile>	21 </ClCompile>

	22 <Link>

	23 <GenerateDebugInformation>true</GenerateDebugInformation>

	24 </Link>

	25 </ItemDefinitionGroup>

	26 <ItemDefinitionGroup Condition="'$(Configuration)' == 'Release'">

	27 <Link>

	28 <GenerateDebugInformation>false</GenerateDebugInformation>

	29 </Link>

19 </ItemDefinitionGroup>	30 </ItemDefinitionGroup>

20	31

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

22 <ItemDefinitionGroup>	33 <ItemDefinitionGroup>

23 <Link>	34 <Link>

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

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

	37 <SubSystem>Windows</SubSystem>

25 </Link>	38 </Link>

26 </ItemDefinitionGroup>	39 </ItemDefinitionGroup>

27	40

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

29 <PropertyGroup>	42 <PropertyGroup>

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

31 <LocalDebuggerCommandArguments>--register-pepper-plugins="$(TargetPath)";app lication/x-nacl localhost:5103</LocalDebuggerCommandArguments>	44 <LocalDebuggerCommandArguments Condition="$(Configuration) == 'Debug'">--reg ister-pepper-plugins="$(TargetPath)";application/x-nacl localhost:5103 --wait-fo r-debugger-children</LocalDebuggerCommandArguments>

	45 <LocalDebuggerCommandArguments Condition="$(Configuration) != 'Debug'">--reg ister-pepper-plugins="$(TargetPath)";application/x-nacl localhost:5103</LocalDeb uggerCommandArguments>

	46

	47 <LinkIncremental Condition="$(Configuration) == 'Debug'">true</LinkIncrement al>

	48 <LinkIncremental Condition="$(Configuration) != 'Debug'">false</LinkIncremen tal>

32 </PropertyGroup>	49 </PropertyGroup>

33 </Project>	50 </Project>

OLD	NEW