Index: visual_studio/NativeClientVSAddIn/InstallerResources/examples/hello_world_gles/hello_world_gles/hello_world_gles.vcxproj |
=================================================================== |
--- visual_studio/NativeClientVSAddIn/InstallerResources/examples/hello_world_gles/hello_world_gles/hello_world_gles.vcxproj (revision 1411) |
+++ visual_studio/NativeClientVSAddIn/InstallerResources/examples/hello_world_gles/hello_world_gles/hello_world_gles.vcxproj (working copy) |
@@ -72,6 +72,7 @@ |
<NaClIrtPath>$(VSNaClSDKRoot)\tools\irt_x86_64.nexe</NaClIrtPath> |
<OutDir>$(ProjectDir)$(ToolchainName)\</OutDir> |
<IntDir>$(ToolchainName)\$(Configuration)\</IntDir> |
+ <NaClAddInVersion>1.0.4611.21610</NaClAddInVersion> |
</PropertyGroup> |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl'"> |
<IncludePath>$(VSNaClSDKRoot)include;</IncludePath> |
@@ -79,16 +80,19 @@ |
<NaClIrtPath>$(VSNaClSDKRoot)\tools\irt_x86_64.nexe</NaClIrtPath> |
<OutDir>$(ProjectDir)$(ToolchainName)\</OutDir> |
<IntDir>$(ToolchainName)\$(Configuration)\</IntDir> |
+ <NaClAddInVersion>1.0.4611.21610</NaClAddInVersion> |
</PropertyGroup> |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PPAPI'"> |
<IncludePath>$(VSNaClSDKRoot)include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath> |
<LibraryPath>$(VSNaClSDKRoot)lib\win_x86_32_host\$(Configuration);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath> |
<ExecutablePath>$(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(WindowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bin;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath> |
+ <NaClAddInVersion>1.0.4611.21610</NaClAddInVersion> |
</PropertyGroup> |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PPAPI'"> |
<IncludePath>$(VSNaClSDKRoot)include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath> |
<LibraryPath>$(VSNaClSDKRoot)lib\win_x86_32_host\$(Configuration);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath> |
<ExecutablePath>$(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(WindowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bin;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath> |
+ <NaClAddInVersion>1.0.4611.21610</NaClAddInVersion> |
</PropertyGroup> |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
<ClCompile> |
@@ -125,6 +129,10 @@ |
<AdditionalDependencies>ppapi;ppapi_gles2</AdditionalDependencies> |
<OutputFile>$(TargetDir)$(TargetName)_$(TargetArchitecture)$(TargetExt)</OutputFile> |
</Link> |
+ <PostBuildEvent> |
+ <Command>set PATH=$(Path) |
+python.exe $(VSNaClSDKRoot)\tools\create_nmf.py -D $(VSNaClSDKRoot)\toolchain\win_x86_$(ToolchainName)\bin\x86_64-nacl-objdump.exe -L $(VSNaClSDKRoot)\toolchain\win_x86_$(ToolchainName)\x86_64-nacl\lib -L $(VSNaClSDKRoot)\toolchain\win_x86_$(ToolchainName)\x86_64-nacl\lib32 -o $(ToolchainName)\hello_world_gles.nmf -t $(ToolchainName) -s $(ToolchainName) $(TargetDir)$(TargetName)_$(TargetArchitecture)$(TargetExt)</Command> |
+ </PostBuildEvent> |
</ItemDefinitionGroup> |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl'"> |
<Link> |
@@ -133,19 +141,17 @@ |
</ItemDefinitionGroup> |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PPAPI'"> |
<Link> |
- <AdditionalDependencies>ppapi.lib;ppapi_gles2.lib</AdditionalDependencies> |
+ <AdditionalDependencies>ppapi.lib;ppapi_gles2.lib;</AdditionalDependencies> |
</Link> |
</ItemDefinitionGroup> |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PPAPI'"> |
<Link> |
- <AdditionalDependencies>ppapi.lib;ppapi_gles2.lib</AdditionalDependencies> |
+ <AdditionalDependencies>ppapi.lib;ppapi_gles2.lib;</AdditionalDependencies> |
</Link> |
</ItemDefinitionGroup> |
<ItemGroup> |
<None Include="common.js" /> |
<None Include="fragment_shader_es2.frag" /> |
- <None Include="hello_world_gles_glibc.nmf" /> |
- <None Include="hello_world_gles_newlib.nmf" /> |
<None Include="index_glibc.html" /> |
<None Include="index_newlib.html" /> |
<None Include="index_win.html" /> |