MoNTE48
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation problems due to last update. Fix vc10 project files 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3562 dfc29bdd-3216-0410-991c-e03cc46cb475
master
hybrid 2011-01-17 08:37:00 +00:00
parent 9b277bea38
commit 58d6c11fa0
12 changed files with 119 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/18.SplitScreen/SplitScreen_vc10.vcxproj
View File

@ -67,7 +67,6 @@
<OutputFile>..\..\bin\Win32-VisualStudio\18.SplitScreen.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)SplitScreen.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<DataExecutionPrevention>
</DataExecutionPrevention>
@ -105,4 +104,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

3
examples/21.Quake3Explorer/Quake3Explorer_vc10.vcxproj
View File

@ -67,7 +67,6 @@
<OutputFile>..\..\bin\Win32-VisualStudio\21.Quake3Explorer.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)Quake3MapShader.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<DataExecutionPrevention>
</DataExecutionPrevention>
@ -111,4 +110,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

3
examples/22.MaterialViewer/MaterialViewer_vc10.vcxproj
View File

@ -105,7 +105,6 @@
<OutputFile>..\..\bin\Win32-VisualStudio\22.MaterialViewer.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\Debug/MaterialViewer.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<DataExecutionPrevention>
</DataExecutionPrevention>
@ -125,4 +124,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

3
examples/23.SMeshHandling/SMeshHandling_vc10.vcxproj
View File

@ -67,7 +67,6 @@
<OutputFile>..\..\bin\Win32-VisualStudio\23.SMeshHandling.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)SMeshHandling.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<DataExecutionPrevention>
</DataExecutionPrevention>
@ -104,4 +103,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

3
examples/24.CursorControl/CursorControl_vc10.vcxproj
View File

@ -65,7 +65,6 @@
<OutputFile>..\..\bin\Win32-VisualStudio\24.CursorControl.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)CursorControl.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<DataExecutionPrevention>
</DataExecutionPrevention>
@ -102,4 +101,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

2
include/IrrCompileConfig.h
View File

@ -183,7 +183,7 @@ You should only use this define if you really need the OpenGL-ES driver, and
it should be usually the only HW accelerated one. OpenGL is currently disabled
if using this driver, to avoid problems with the ogl-es emulators.
*/
//#define _IRR_COMPILE_WITH_OGLES2_
#define _IRR_COMPILE_WITH_OGLES2_
#ifdef NO_IRR_COMPILE_WITH_OGLES2_
#undef _IRR_COMPILE_WITH_OGLES2_
#endif

4
source/Irrlicht/COGLES2Texture.cpp
View File

@ -245,9 +245,9 @@ namespace irr
//! lock function
/** TODO: support miplevel */
void* COGLES2Texture::lock( bool readOnly, u32 mipmapLevel )
void* COGLES2Texture::lock(E_TEXTURE_LOCK_MODE mode, u32 mipmapLevel)
{
ReadOnlyLock |= readOnly;
ReadOnlyLock |= (mode==ETLM_READ_ONLY);
if ( !Image )
Image = new CImage( ECF_A8R8G8B8, ImageSize );

2
source/Irrlicht/COGLES2Texture.h
View File

@ -30,7 +30,7 @@ namespace irr
virtual ~COGLES2Texture();
//! lock function
virtual void* lock( bool readOnly=false, u32 mipmapLevel=0 );
virtual void* lock(E_TEXTURE_LOCK_MODE mode=ETLM_READ_WRITE, u32 mipmapLevel=0);
//! unlock function
virtual void unlock();

31
source/Irrlicht/Irrlicht10.0.vcxproj
View File

@ -271,7 +271,7 @@
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Static lib - Release|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Static lib - Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Static lib - Release|x64'" />
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(DXSDK_DIR)include;$(IncludePath)</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Imagination Technologies\POWERVR SDK\OGLES2_WINDOWS_PCEMULATION_2.07.27.0484\Builds\OGLES2\Include;$(DXSDK_DIR)include;$(IncludePath)</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(DXSDK_DIR)include;$(IncludePath)</IncludePath>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\$(Configuration)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\$(Configuration)64\</IntDir>
@ -289,6 +289,8 @@
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Static lib - Release - Fast FPU|x64'">$(DXSDK_DIR)include;$(IncludePath)</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Static lib - Release|Win32'">$(DXSDK_DIR)include;$(IncludePath)</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Static lib - Release|x64'">$(DXSDK_DIR)include;$(IncludePath)</IncludePath>
<ExecutablePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Imagination Technologies\POWERVR SDK\OGLES2_WINDOWS_PCEMULATION_2.07.27.0484\Builds\OGLES2\WindowsPC\Lib;$(ExecutablePath)</ExecutablePath>
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Imagination Technologies\POWERVR SDK\OGLES2_WINDOWS_PCEMULATION_2.07.27.0484\Builds\OGLES2\WindowsPC\Lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@ -319,7 +321,7 @@
</ProjectReference>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;opengl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\bin\Win32-visualstudio\Irrlicht.dll</OutputFile>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>libci.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@ -812,6 +814,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\include\driverChoice.h" />
<ClInclude Include="..\..\include\IAnimatedMeshMD3.h" />
<ClInclude Include="..\..\include\IEventReceiver.h" />
<ClInclude Include="..\..\include\ILogger.h" />
@ -970,6 +973,19 @@
<ClInclude Include="CGeometryCreator.h" />
<ClInclude Include="CMeshCache.h" />
<ClInclude Include="CMeshManipulator.h" />
<ClInclude Include="COGLES2Driver.h" />
<ClInclude Include="COGLES2ExtensionHandler.h" />
<ClInclude Include="COGLES2FixedPipelineShader.h" />
<ClInclude Include="COGLES2MaterialRenderer.h" />
<ClInclude Include="COGLES2NormalMapRenderer.h" />
<ClInclude Include="COGLES2ParallaxMapRenderer.h" />
<ClInclude Include="COGLES2Renderer2D.h" />
<ClInclude Include="COGLES2SLMaterialRenderer.h" />
<ClInclude Include="COGLES2Texture.h" />
<ClInclude Include="COGLESDriver.h" />
<ClInclude Include="COGLESExtensionHandler.h" />
<ClInclude Include="COGLESMaterialRenderer.h" />
<ClInclude Include="COGLESTexture.h" />
<ClInclude Include="CSceneManager.h" />
<ClInclude Include="Octree.h" />
<ClInclude Include="C3DSMeshFileLoader.h" />
@ -1215,6 +1231,17 @@
<ClCompile Include="CGeometryCreator.cpp" />
<ClCompile Include="CMeshCache.cpp" />
<ClCompile Include="CMeshManipulator.cpp" />
<ClCompile Include="COGLES2Driver.cpp" />
<ClCompile Include="COGLES2ExtensionHandler.cpp" />
<ClCompile Include="COGLES2FixedPipelineShader.cpp" />
<ClCompile Include="COGLES2NormalMapRenderer.cpp" />
<ClCompile Include="COGLES2ParallaxMapRenderer.cpp" />
<ClCompile Include="COGLES2Renderer2D.cpp" />
<ClCompile Include="COGLES2SLMaterialRenderer.cpp" />
<ClCompile Include="COGLES2Texture.cpp" />
<ClCompile Include="COGLESDriver.cpp" />
<ClCompile Include="COGLESExtensionHandler.cpp" />
<ClCompile Include="COGLESTexture.cpp" />
<ClCompile Include="CSceneManager.cpp" />
<ClCompile Include="C3DSMeshFileLoader.cpp" />
<ClCompile Include="CAnimatedMeshHalfLife.cpp" />

81
source/Irrlicht/Irrlicht10.0.vcxproj.filters
View File

@ -103,6 +103,12 @@
<Filter Include="Irrlicht\gui">
<UniqueIdentifier>{da421793-4674-481c-be46-f7a44e78aee5}</UniqueIdentifier>
</Filter>
<Filter Include="Irrlicht\video\OpenGL-ES 1.x">
<UniqueIdentifier>{f85fdc72-0905-4f0d-b663-da2c32c1c53e}</UniqueIdentifier>
</Filter>
<Filter Include="Irrlicht\video\OpenGL-ES 2.x">
<UniqueIdentifier>{f5c11425-7060-4a40-8de9-5178c00ed4c0}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\IEventReceiver.h">
@ -1279,6 +1285,48 @@
<Filter>include\scene</Filter>
</ClInclude>
<ClInclude Include="resource.h" />
<ClInclude Include="COGLESTexture.h">
<Filter>Irrlicht\video\OpenGL-ES 1.x</Filter>
</ClInclude>
<ClInclude Include="COGLESDriver.h">
<Filter>Irrlicht\video\OpenGL-ES 1.x</Filter>
</ClInclude>
<ClInclude Include="COGLESExtensionHandler.h">
<Filter>Irrlicht\video\OpenGL-ES 1.x</Filter>
</ClInclude>
<ClInclude Include="COGLESMaterialRenderer.h">
<Filter>Irrlicht\video\OpenGL-ES 1.x</Filter>
</ClInclude>
<ClInclude Include="COGLES2Texture.h">
<Filter>Irrlicht\video\OpenGL-ES 2.x</Filter>
</ClInclude>
<ClInclude Include="COGLES2Driver.h">
<Filter>Irrlicht\video\OpenGL-ES 2.x</Filter>
</ClInclude>
<ClInclude Include="COGLES2ExtensionHandler.h">
<Filter>Irrlicht\video\OpenGL-ES 2.x</Filter>
</ClInclude>
<ClInclude Include="COGLES2FixedPipelineShader.h">
<Filter>Irrlicht\video\OpenGL-ES 2.x</Filter>
</ClInclude>
<ClInclude Include="COGLES2MaterialRenderer.h">
<Filter>Irrlicht\video\OpenGL-ES 2.x</Filter>
</ClInclude>
<ClInclude Include="COGLES2NormalMapRenderer.h">
<Filter>Irrlicht\video\OpenGL-ES 2.x</Filter>
</ClInclude>
<ClInclude Include="COGLES2ParallaxMapRenderer.h">
<Filter>Irrlicht\video\OpenGL-ES 2.x</Filter>
</ClInclude>
<ClInclude Include="COGLES2Renderer2D.h">
<Filter>Irrlicht\video\OpenGL-ES 2.x</Filter>
</ClInclude>
<ClInclude Include="COGLES2SLMaterialRenderer.h">
<Filter>Irrlicht\video\OpenGL-ES 2.x</Filter>
</ClInclude>
<ClInclude Include="..\..\include\driverChoice.h">
<Filter>include\video</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\changes.txt">
@ -2198,6 +2246,39 @@
<ClCompile Include="CGUIWindow.cpp">
<Filter>Irrlicht\gui</Filter>
</ClCompile>
<ClCompile Include="COGLESDriver.cpp">
<Filter>Irrlicht\video\OpenGL-ES 1.x</Filter>
</ClCompile>
<ClCompile Include="COGLESExtensionHandler.cpp">
<Filter>Irrlicht\video\OpenGL-ES 1.x</Filter>
</ClCompile>
<ClCompile Include="COGLESTexture.cpp">
<Filter>Irrlicht\video\OpenGL-ES 1.x</Filter>
</ClCompile>
<ClCompile Include="COGLES2Driver.cpp">
<Filter>Irrlicht\video\OpenGL-ES 2.x</Filter>
</ClCompile>
<ClCompile Include="COGLES2ExtensionHandler.cpp">
<Filter>Irrlicht\video\OpenGL-ES 2.x</Filter>
</ClCompile>
<ClCompile Include="COGLES2FixedPipelineShader.cpp">
<Filter>Irrlicht\video\OpenGL-ES 2.x</Filter>
</ClCompile>
<ClCompile Include="COGLES2NormalMapRenderer.cpp">
<Filter>Irrlicht\video\OpenGL-ES 2.x</Filter>
</ClCompile>
<ClCompile Include="COGLES2ParallaxMapRenderer.cpp">
<Filter>Irrlicht\video\OpenGL-ES 2.x</Filter>
</ClCompile>
<ClCompile Include="COGLES2Renderer2D.cpp">
<Filter>Irrlicht\video\OpenGL-ES 2.x</Filter>
</ClCompile>
<ClCompile Include="COGLES2SLMaterialRenderer.cpp">
<Filter>Irrlicht\video\OpenGL-ES 2.x</Filter>
</ClCompile>
<ClCompile Include="COGLES2Texture.cpp">
<Filter>Irrlicht\video\OpenGL-ES 2.x</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Irrlicht.rc" />

1
tools/GUIEditor/GUI Editor_vc10.vcxproj
View File

@ -70,7 +70,6 @@
<OutputFile>../../bin/Win32-visualstudio/GUIEditor.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)TestProject.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<DataExecutionPrevention>
</DataExecutionPrevention>

1
tools/MeshConverter/MeshConverter_vc10.vcxproj
View File

@ -70,7 +70,6 @@
<OutputFile>../../bin/Win32-visualstudio/MeshConverter.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)TestProject.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<DataExecutionPrevention>
</DataExecutionPrevention>