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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: visual_studio/NativeClientVSAddIn/InstallerResources/examples/hello_nacl/hello_nacl/hello_nacl.vcxproj

Issue 11150028: Add new VS AddIn examples (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
« visual_studio/NativeClientVSAddIn/InstallerResources/examples/hello_nacl/hello_nacl/hello_nacl.nmf ('K') | « visual_studio/NativeClientVSAddIn/InstallerResources/examples/hello_nacl/hello_nacl/hello_nacl.nmf ('k') | visual_studio/NativeClientVSAddIn/InstallerResources/examples/hello_nacl/hello_nacl/index.html » ('j') | visual_studio/NativeClientVSAddIn/InstallerResources/examples/hello_nacl/hello_nacl/index.html » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microso ft.com/developer/msbuild/2003"> 2 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microso ft.com/developer/msbuild/2003">
3 <ItemGroup Label="ProjectConfigurations"> 3 <ItemGroup Label="ProjectConfigurations">
4 <ProjectConfiguration Include="Debug|NaCl32">
5 <Configuration>Debug</Configuration>
6 <Platform>NaCl32</Platform>
7 </ProjectConfiguration>
8 <ProjectConfiguration Include="Debug|NaCl64"> 4 <ProjectConfiguration Include="Debug|NaCl64">
9 <Configuration>Debug</Configuration> 5 <Configuration>Debug</Configuration>
10 <Platform>NaCl64</Platform> 6 <Platform>NaCl64</Platform>
11 </ProjectConfiguration> 7 </ProjectConfiguration>
12 <ProjectConfiguration Include="Debug|PPAPI"> 8 <ProjectConfiguration Include="Debug|PPAPI">
13 <Configuration>Debug</Configuration> 9 <Configuration>Debug</Configuration>
14 <Platform>PPAPI</Platform> 10 <Platform>PPAPI</Platform>
15 </ProjectConfiguration> 11 </ProjectConfiguration>
16 <ProjectConfiguration Include="Release|NaCl32"> 12 <ProjectConfiguration Include="Debug|Win32">
17 <Configuration>Release</Configuration> 13 <Configuration>Debug</Configuration>
18 <Platform>NaCl32</Platform> 14 <Platform>Win32</Platform>
19 </ProjectConfiguration> 15 </ProjectConfiguration>
20 <ProjectConfiguration Include="Release|NaCl64"> 16 <ProjectConfiguration Include="Release|NaCl64">
21 <Configuration>Release</Configuration> 17 <Configuration>Release</Configuration>
22 <Platform>NaCl64</Platform> 18 <Platform>NaCl64</Platform>
23 </ProjectConfiguration> 19 </ProjectConfiguration>
24 <ProjectConfiguration Include="Release|PPAPI"> 20 <ProjectConfiguration Include="Release|PPAPI">
25 <Configuration>Release</Configuration> 21 <Configuration>Release</Configuration>
26 <Platform>PPAPI</Platform> 22 <Platform>PPAPI</Platform>
27 </ProjectConfiguration> 23 </ProjectConfiguration>
24 <ProjectConfiguration Include="Release|Win32">
25 <Configuration>Release</Configuration>
26 <Platform>Win32</Platform>
27 </ProjectConfiguration>
28 </ItemGroup> 28 </ItemGroup>
29 <PropertyGroup Label="Globals"> 29 <PropertyGroup Label="Globals">
30 <ProjectGuid>{F82336A6-3A85-45E2-9A96-26DEA54280C5}</ProjectGuid> 30 <ProjectGuid>{0A0BEABE-8F63-46EA-A60B-AE7DAC7A689D}</ProjectGuid>
31 <Keyword>Win32Proj</Keyword> 31 <Keyword>Win32Proj</Keyword>
32 <RootNamespace>hello_world_gles</RootNamespace> 32 <RootNamespace>hello_nacl</RootNamespace>
33 </PropertyGroup> 33 </PropertyGroup>
34 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 34 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
35 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)' =='Debug|NaCl64'"> 35 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label ="Configuration">
36 <ToolchainName>newlib</ToolchainName> 36 <ConfigurationType>Application</ConfigurationType>
37 <UseDebugLibraries>true</UseDebugLibraries>
38 <CharacterSet>Unicode</CharacterSet>
37 </PropertyGroup> 39 </PropertyGroup>
38 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|NaCl32'" Labe l="Configuration"> 40 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Lab el="Configuration">
39 <ToolchainName>newlib</ToolchainName> 41 <ConfigurationType>Application</ConfigurationType>
40 </PropertyGroup> 42 <UseDebugLibraries>false</UseDebugLibraries>
41 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)' =='Release|NaCl64'"> 43 <WholeProgramOptimization>true</WholeProgramOptimization>
42 <ToolchainName>newlib</ToolchainName> 44 <CharacterSet>Unicode</CharacterSet>
43 </PropertyGroup>
44 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl32'" La bel="Configuration">
45 <ToolchainName>newlib</ToolchainName>
46 </PropertyGroup> 45 </PropertyGroup>
47 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 46 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
48 <ImportGroup Label="ExtensionSettings"> 47 <ImportGroup Label="ExtensionSettings">
49 </ImportGroup> 48 </ImportGroup>
49 <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'= ='Debug|Win32'">
50 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condit ion="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="Local AppDataPlatform" />
51 </ImportGroup>
52 <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'= ='Release|Win32'">
53 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condit ion="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="Local AppDataPlatform" />
54 </ImportGroup>
50 <PropertyGroup Label="UserMacros" /> 55 <PropertyGroup Label="UserMacros" />
56 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
57 <LinkIncremental>true</LinkIncremental>
58 </PropertyGroup>
59 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
60 <LinkIncremental>false</LinkIncremental>
61 </PropertyGroup>
62 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PPAPI'">
63 <NaClAddInVersion>1.0.1447</NaClAddInVersion>
64 <ExecutablePath>$(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(Win dowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(V SInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bi n;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PAT H);</ExecutablePath>
65 <IncludePath>$(VSNaClSDKRoot)include\win;$(VSNaClSDKRoot)include;$(VCInstall Dir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDK Dir)\include</IncludePath>
66 <LibraryPath>$(VSNaClSDKRoot)lib\win_x86_32_host\$(Configuration);$(VCInstal lDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</L ibraryPath>
67 </PropertyGroup>
68 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PPAPI'">
69 <NaClAddInVersion>1.0.1447</NaClAddInVersion>
70 <ExecutablePath>$(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(Win dowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(V SInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bi n;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PAT H);</ExecutablePath>
71 <IncludePath>$(VSNaClSDKRoot)include;$(VCInstallDir)include;$(VCInstallDir)a tlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
72 <LibraryPath>$(VSNaClSDKRoot)lib\win_x86_32_host\$(Configuration);$(VCInstal lDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</L ibraryPath>
73 </PropertyGroup>
51 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|NaCl64'"> 74 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|NaCl64'">
52 <NaClAddInVersion>1</NaClAddInVersion> 75 <NaClAddInVersion>1.0.1447</NaClAddInVersion>
53 <VSNaClSDKRoot>$(NACL_SDK_ROOT)\</VSNaClSDKRoot>
54 <IncludePath>$(VSNaClSDKRoot)include;</IncludePath>
55 <LibraryPath>$(VSNaClSDKRoot)lib;</LibraryPath>
56 </PropertyGroup>
57 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|NaCl32'">
58 <NaClAddInVersion>1</NaClAddInVersion>
59 <VSNaClSDKRoot>$(NACL_SDK_ROOT)\</VSNaClSDKRoot> 76 <VSNaClSDKRoot>$(NACL_SDK_ROOT)\</VSNaClSDKRoot>
60 <IncludePath>$(VSNaClSDKRoot)include;</IncludePath> 77 <IncludePath>$(VSNaClSDKRoot)include;</IncludePath>
61 <LibraryPath>$(VSNaClSDKRoot)lib;</LibraryPath> 78 <LibraryPath>$(VSNaClSDKRoot)lib;</LibraryPath>
62 </PropertyGroup> 79 </PropertyGroup>
63 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl64'"> 80 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl64'">
64 <NaClAddInVersion>1</NaClAddInVersion> 81 <NaClAddInVersion>1.0.1447</NaClAddInVersion>
65 <VSNaClSDKRoot>$(NACL_SDK_ROOT)\</VSNaClSDKRoot> 82 <VSNaClSDKRoot>$(NACL_SDK_ROOT)\</VSNaClSDKRoot>
66 <IncludePath>$(VSNaClSDKRoot)include;</IncludePath> 83 <IncludePath>$(VSNaClSDKRoot)include;</IncludePath>
67 <LibraryPath>$(VSNaClSDKRoot)lib;</LibraryPath> 84 <LibraryPath>$(VSNaClSDKRoot)lib;</LibraryPath>
68 </PropertyGroup> 85 </PropertyGroup>
69 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl32'"> 86 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" >
70 <NaClAddInVersion>1</NaClAddInVersion> 87 <ClCompile>
71 <VSNaClSDKRoot>$(NACL_SDK_ROOT)\</VSNaClSDKRoot> 88 <PrecompiledHeader>
72 <IncludePath>$(VSNaClSDKRoot)include;</IncludePath> 89 </PrecompiledHeader>
73 <LibraryPath>$(VSNaClSDKRoot)lib;</LibraryPath> 90 <WarningLevel>Level3</WarningLevel>
74 </PropertyGroup> 91 <Optimization>Disabled</Optimization>
75 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PPAPI'"> 92 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)< /PreprocessorDefinitions>
76 <ExecutablePath>$(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(Win dowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(V SInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bi n;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PAT H);</ExecutablePath> 93 </ClCompile>
77 <NaClAddInVersion>1</NaClAddInVersion>
78 <LinkIncremental>false</LinkIncremental>
79 <IncludePath>$(VSNaClSDKRoot)include;$(VCInstallDir)include;$(VCInstallDir)a tlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
80 <LibraryPath>$(VSNaClSDKRoot)lib\win_x86_32_host\$(Configuration);$(VCInstal lDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</L ibraryPath>
81 </PropertyGroup>
82 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PPAPI'">
83 <ExecutablePath>$(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(Win dowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(V SInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bi n;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PAT H);</ExecutablePath>
84 <NaClAddInVersion>1</NaClAddInVersion>
85 <IncludePath>$(VSNaClSDKRoot)include;$(VCInstallDir)include;$(VCInstallDir)a tlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
86 <LibraryPath>$(VSNaClSDKRoot)lib\win_x86_32_host\$(Configuration);$(VCInstal lDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</L ibraryPath>
87 </PropertyGroup>
88 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|NaCl64' ">
89 <Link> 94 <Link>
90 <AdditionalDependencies>ppapi;ppapi_gles2</AdditionalDependencies> 95 <SubSystem>Windows</SubSystem>
91 </Link> 96 <GenerateDebugInformation>true</GenerateDebugInformation>
92 <PostBuildEvent>
93 <Command>set PATH=$(Path)
94 mkdir $(ToolchainName)
95 python.exe "$(VSNaClSDKRoot)\tools\create_nmf.py" -D "$(VSNaClSDKRoot)\toolchain \win_x86_$(ToolchainName)\bin\x86_64-nacl-objdump.exe" -L "$(VSNaClSDKRoot)\tool chain\win_x86_$(ToolchainName)\x86_64-nacl\lib" -L "$(VSNaClSDKRoot)\toolchain\w in_x86_$(ToolchainName)\x86_64-nacl\lib32" -o $(ToolchainName)\hello_world_gles. nmf -t $(ToolchainName) -s $(ToolchainName) "$(TargetPath)"</Command>
96 <Message>Running 'create_nmf'</Message>
97 </PostBuildEvent>
98 </ItemDefinitionGroup>
99 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|NaCl32' ">
100 <Link>
101 <AdditionalDependencies>ppapi;ppapi_gles2</AdditionalDependencies>
102 </Link>
103 <PostBuildEvent>
104 <Command>set PATH=$(Path)
105 mkdir $(ToolchainName)
106 python.exe "$(VSNaClSDKRoot)\tools\create_nmf.py" -D "$(VSNaClSDKRoot)\toolchain \win_x86_$(ToolchainName)\bin\x86_64-nacl-objdump.exe" -L "$(VSNaClSDKRoot)\tool chain\win_x86_$(ToolchainName)\x86_64-nacl\lib" -L "$(VSNaClSDKRoot)\toolchain\w in_x86_$(ToolchainName)\x86_64-nacl\lib32" -o $(ToolchainName)\hello_world_gles. nmf -t $(ToolchainName) -s $(ToolchainName) "$(TargetPath)"</Command>
107 <Message>Running 'create_nmf'</Message>
108 </PostBuildEvent>
109 </ItemDefinitionGroup>
110 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl6 4'">
111 <Link>
112 <AdditionalDependencies>ppapi;ppapi_gles2</AdditionalDependencies>
113 </Link> 97 </Link>
114 </ItemDefinitionGroup> 98 </ItemDefinitionGroup>
115 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl3 2'"> 99 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32 '">
100 <ClCompile>
101 <WarningLevel>Level3</WarningLevel>
102 <PrecompiledHeader>
103 </PrecompiledHeader>
104 <Optimization>MaxSpeed</Optimization>
105 <FunctionLevelLinking>true</FunctionLevelLinking>
106 <IntrinsicFunctions>true</IntrinsicFunctions>
107 <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)< /PreprocessorDefinitions>
108 </ClCompile>
116 <Link> 109 <Link>
117 <AdditionalDependencies>ppapi;ppapi_gles2</AdditionalDependencies> 110 <SubSystem>Windows</SubSystem>
111 <GenerateDebugInformation>true</GenerateDebugInformation>
112 <EnableCOMDATFolding>true</EnableCOMDATFolding>
113 <OptimizeReferences>true</OptimizeReferences>
118 </Link> 114 </Link>
119 </ItemDefinitionGroup> 115 </ItemDefinitionGroup>
120 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PPAPI'" > 116 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PPAPI'" >
121 <Link> 117 <Link>
122 <AdditionalDependencies>ppapi.lib;ppapi_gles2.lib;</AdditionalDependencies > 118 <AdditionalDependencies>ppapi_cpp.lib;ppapi.lib;kernel32.lib;user32.lib;gd i32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.li b;uuid.lib;odbc32.lib;odbccp32.lib;</AdditionalDependencies>
123 </Link> 119 </Link>
124 </ItemDefinitionGroup> 120 </ItemDefinitionGroup>
125 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PPAPI '"> 121 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PPAPI '">
126 <Link> 122 <Link>
127 <AdditionalDependencies>ppapi.lib;ppapi_gles2.lib;</AdditionalDependencies > 123 <AdditionalDependencies>ppapi_cpp.lib;ppapi.lib;kernel32.lib;user32.lib;gd i32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.li b;uuid.lib;odbc32.lib;odbccp32.lib;</AdditionalDependencies>
124 </Link>
125 </ItemDefinitionGroup>
126 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|NaCl64' ">
127 <Link>
128 <AdditionalDependencies>ppapi_cpp;ppapi;</AdditionalDependencies>
129 </Link>
130 </ItemDefinitionGroup>
131 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl6 4'">
132 <Link>
133 <AdditionalDependencies>ppapi_cpp;ppapi;</AdditionalDependencies>
128 </Link> 134 </Link>
129 </ItemDefinitionGroup> 135 </ItemDefinitionGroup>
130 <ItemGroup> 136 <ItemGroup>
131 <None Include="common.js" /> 137 <None Include="hello_nacl.nmf" />
132 <None Include="fragment_shader_es2.frag" /> 138 <None Include="index.html" />
133 <None Include="index_glibc.html" />
134 <None Include="index_newlib.html" />
135 <None Include="index_win.html" />
136 <None Include="vertex_shader_es2.vert" />
137 </ItemGroup> 139 </ItemGroup>
138 <ItemGroup> 140 <ItemGroup>
139 <ClCompile Include="hello_world.cc" /> 141 <ClCompile Include="hello_nacl.c" />
140 <ClCompile Include="matrix.cc" />
141 </ItemGroup>
142 <ItemGroup>
143 <ClInclude Include="matrix.h" />
144 </ItemGroup> 142 </ItemGroup>
145 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 143 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
146 <ImportGroup Label="ExtensionTargets"> 144 <ImportGroup Label="ExtensionTargets">
147 </ImportGroup> 145 </ImportGroup>
148 </Project> 146 </Project>
OLDNEW
« visual_studio/NativeClientVSAddIn/InstallerResources/examples/hello_nacl/hello_nacl/hello_nacl.nmf ('K') | « visual_studio/NativeClientVSAddIn/InstallerResources/examples/hello_nacl/hello_nacl/hello_nacl.nmf ('k') | visual_studio/NativeClientVSAddIn/InstallerResources/examples/hello_nacl/hello_nacl/index.html » ('j') | visual_studio/NativeClientVSAddIn/InstallerResources/examples/hello_nacl/hello_nacl/index.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698