visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/ImportAfter/PPAPI.override.props - Issue 11145025: Only store major version of AddIn in VS project file

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

Issue 11145025: Only store major version of AddIn in VS project file (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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « no previous file | visual_studio/NativeClientVSAddIn/InstallerResources/examples/hello_world_gles/hello_world_gles/hello_world_gles.vcxproj » ('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>

(...skipping 10 matching lines...) Expand all Loading...
21 </ClCompile>	21 </ClCompile>

22 <Link>	22 <Link>

23 <GenerateDebugInformation>true</GenerateDebugInformation>	23 <GenerateDebugInformation>true</GenerateDebugInformation>

24 </Link>	24 </Link>

25 </ItemDefinitionGroup>	25 </ItemDefinitionGroup>

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

27 <Link>	27 <Link>

28 <GenerateDebugInformation>false</GenerateDebugInformation>	28 <GenerateDebugInformation>false</GenerateDebugInformation>

29 </Link>	29 </Link>

30 </ItemDefinitionGroup>	30 </ItemDefinitionGroup>

31	31

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

33 <ItemDefinitionGroup>	33 <ItemDefinitionGroup>

34 <Link>	34 <Link>

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

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

37 <SubSystem>Windows</SubSystem>	37 <SubSystem>Windows</SubSystem>

38 </Link>	38 </Link>

39 </ItemDefinitionGroup>	39 </ItemDefinitionGroup>

40	40

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

42 <PropertyGroup>	42 <PropertyGroup>

	43 <TargetPath Condition="'$(TargetPath)' == ''">$([System.IO.Path]::Combine($( ProjectDir),$(OutDir)$(TargetName)$(TargetExt)))</TargetPath>

43 <LocalDebuggerCommand>$(CHROME_PATH)</LocalDebuggerCommand>	44 <LocalDebuggerCommand>$(CHROME_PATH)</LocalDebuggerCommand>

44 <LocalDebuggerCommandArguments Condition="$(Configuration) == 'Debug'">--reg ister-pepper-plugins="$(TargetPath)";application/x-nacl localhost:$(NaClWebServe rPort) --user-data-dir="$(ProjectDir)/chrome_data" --enable-nacl --wait-for-debu gger-children --no-sandbox</LocalDebuggerCommandArguments>	45 <LocalDebuggerCommandArguments Condition="$(Configuration) == 'Debug'">--reg ister-pepper-plugins="$(TargetPath)";application/x-nacl localhost:$(NaClWebServe rPort) --user-data-dir="$(ProjectDir)/chrome_data" --enable-nacl --wait-for-debu gger-children --no-sandbox</LocalDebuggerCommandArguments>

45 <LocalDebuggerCommandArguments Condition="$(Configuration) != 'Debug'">--reg ister-pepper-plugins="$(TargetPath)";application/x-nacl localhost:$(NaClWebServe rPort) --user-data-dir="$(ProjectDir)/chrome_data" --enable-nacl</LocalDebuggerC ommandArguments>	46 <LocalDebuggerCommandArguments Condition="$(Configuration) != 'Debug'">--reg ister-pepper-plugins="$(TargetPath)";application/x-nacl localhost:$(NaClWebServe rPort) --user-data-dir="$(ProjectDir)/chrome_data" --enable-nacl</LocalDebuggerC ommandArguments>

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

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

48 </PropertyGroup>	49 </PropertyGroup>

49 </Project>	50 </Project>

OLD	NEW