minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2024-11-10 20:30:41 +01:00
Code Issues Projects Releases Wiki Activity

Merging r6381 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6382 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien 2022-05-05 13:28:44 +00:00
parent 67a488fc5c
commit 0555e03109
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/Irrlicht/Irrlicht-gcc.cbp
View File

@ -970,11 +970,11 @@
<Unit filename="CTRFlatWire.cpp" /> <Unit filename="CTRFlatWire.cpp" />
<Unit filename="CTRGouraud.cpp" /> <Unit filename="CTRGouraud.cpp" />
<Unit filename="CTRGouraud2.cpp" /> <Unit filename="CTRGouraud2.cpp" />
<Unit filename="CTRGouraudAlpha2.cpp" />
<Unit filename="CTRGouraudAlphaNoZ2.cpp" /> <Unit filename="CTRGouraudAlphaNoZ2.cpp" />
<Unit filename="CTRGouraudNoZ2.cpp" /> <Unit filename="CTRGouraudNoZ2.cpp" />
<Unit filename="CTRGouraudWire.cpp" /> <Unit filename="CTRGouraudWire.cpp" />
<Unit filename="CTRNormalMap.cpp" /> <Unit filename="CTRNormalMap.cpp" />
<Unit filename="CTRParallaxMap.cpp" />
<Unit filename="CTRStencilShadow.cpp" /> <Unit filename="CTRStencilShadow.cpp" />
<Unit filename="CTRTextureBlend.cpp" /> <Unit filename="CTRTextureBlend.cpp" />
<Unit filename="CTRTextureDetailMap2.cpp" /> <Unit filename="CTRTextureDetailMap2.cpp" />

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

@ -1459,9 +1459,9 @@
<ClCompile Include="CSoftwareDriver2.cpp" /> <ClCompile Include="CSoftwareDriver2.cpp" />
<ClCompile Include="CSoftwareTexture2.cpp" /> <ClCompile Include="CSoftwareTexture2.cpp" />
<ClCompile Include="CTRGouraud2.cpp" /> <ClCompile Include="CTRGouraud2.cpp" />
<ClCompile Include="CTRGouraudAlpha2.cpp" />
<ClCompile Include="CTRGouraudAlphaNoZ2.cpp" /> <ClCompile Include="CTRGouraudAlphaNoZ2.cpp" />
<ClCompile Include="CTRNormalMap.cpp" /> <ClCompile Include="CTRNormalMap.cpp" />
<ClCompile Include="CTRParallaxMap.cpp" />
<ClCompile Include="CTRStencilShadow.cpp" /> <ClCompile Include="CTRStencilShadow.cpp" />
<ClCompile Include="CTRTextureBlend.cpp" /> <ClCompile Include="CTRTextureBlend.cpp" />
<ClCompile Include="CTRTextureDetailMap2.cpp" /> <ClCompile Include="CTRTextureDetailMap2.cpp" />

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

@ -1886,15 +1886,15 @@
<ClCompile Include="CTRGouraud2.cpp"> <ClCompile Include="CTRGouraud2.cpp">
<Filter>Irrlicht\video\Burning Video</Filter> <Filter>Irrlicht\video\Burning Video</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="CTRGouraudAlpha2.cpp">
<Filter>Irrlicht\video\Burning Video</Filter>
</ClCompile>
<ClCompile Include="CTRGouraudAlphaNoZ2.cpp"> <ClCompile Include="CTRGouraudAlphaNoZ2.cpp">
<Filter>Irrlicht\video\Burning Video</Filter> <Filter>Irrlicht\video\Burning Video</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="CTRNormalMap.cpp"> <ClCompile Include="CTRNormalMap.cpp">
<Filter>Irrlicht\video\Burning Video</Filter> <Filter>Irrlicht\video\Burning Video</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="CTRParallaxMap.cpp">
<Filter>Irrlicht\video\Burning Video</Filter>
</ClCompile>
<ClCompile Include="CTRStencilShadow.cpp"> <ClCompile Include="CTRStencilShadow.cpp">
<Filter>Irrlicht\video\Burning Video</Filter> <Filter>Irrlicht\video\Burning Video</Filter>
</ClCompile> </ClCompile>

2
source/Irrlicht/Irrlicht11.0.vcxproj
View File

@ -1457,9 +1457,9 @@
<ClCompile Include="CSoftwareDriver2.cpp" /> <ClCompile Include="CSoftwareDriver2.cpp" />
<ClCompile Include="CSoftwareTexture2.cpp" /> <ClCompile Include="CSoftwareTexture2.cpp" />
<ClCompile Include="CTRGouraud2.cpp" /> <ClCompile Include="CTRGouraud2.cpp" />
<ClCompile Include="CTRGouraudAlpha2.cpp" />
<ClCompile Include="CTRGouraudAlphaNoZ2.cpp" /> <ClCompile Include="CTRGouraudAlphaNoZ2.cpp" />
<ClCompile Include="CTRNormalMap.cpp" /> <ClCompile Include="CTRNormalMap.cpp" />
<ClCompile Include="CTRParallaxMap.cpp" />
<ClCompile Include="CTRStencilShadow.cpp" /> <ClCompile Include="CTRStencilShadow.cpp" />
<ClCompile Include="CTRTextureBlend.cpp" /> <ClCompile Include="CTRTextureBlend.cpp" />
<ClCompile Include="CTRTextureDetailMap2.cpp" /> <ClCompile Include="CTRTextureDetailMap2.cpp" />

6
source/Irrlicht/Irrlicht11.0.vcxproj.filters
View File

@ -1883,15 +1883,15 @@
<ClCompile Include="CTRGouraud2.cpp"> <ClCompile Include="CTRGouraud2.cpp">
<Filter>Irrlicht\video\Burning Video</Filter> <Filter>Irrlicht\video\Burning Video</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="CTRGouraudAlpha2.cpp">
<Filter>Irrlicht\video\Burning Video</Filter>
</ClCompile>
<ClCompile Include="CTRGouraudAlphaNoZ2.cpp"> <ClCompile Include="CTRGouraudAlphaNoZ2.cpp">
<Filter>Irrlicht\video\Burning Video</Filter> <Filter>Irrlicht\video\Burning Video</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="CTRNormalMap.cpp"> <ClCompile Include="CTRNormalMap.cpp">
<Filter>Irrlicht\video\Burning Video</Filter> <Filter>Irrlicht\video\Burning Video</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="CTRParallaxMap.cpp">
<Filter>Irrlicht\video\Burning Video</Filter>
</ClCompile>
<ClCompile Include="CTRStencilShadow.cpp"> <ClCompile Include="CTRStencilShadow.cpp">
<Filter>Irrlicht\video\Burning Video</Filter> <Filter>Irrlicht\video\Burning Video</Filter>
</ClCompile> </ClCompile>

2
source/Irrlicht/Irrlicht12.0.vcxproj
View File

@ -1457,9 +1457,9 @@
<ClCompile Include="CSoftwareDriver2.cpp" /> <ClCompile Include="CSoftwareDriver2.cpp" />
<ClCompile Include="CSoftwareTexture2.cpp" /> <ClCompile Include="CSoftwareTexture2.cpp" />
<ClCompile Include="CTRGouraud2.cpp" /> <ClCompile Include="CTRGouraud2.cpp" />
<ClCompile Include="CTRGouraudAlpha2.cpp" />
<ClCompile Include="CTRGouraudAlphaNoZ2.cpp" /> <ClCompile Include="CTRGouraudAlphaNoZ2.cpp" />
<ClCompile Include="CTRNormalMap.cpp" /> <ClCompile Include="CTRNormalMap.cpp" />
<ClCompile Include="CTRParallaxMap.cpp" />
<ClCompile Include="CTRStencilShadow.cpp" /> <ClCompile Include="CTRStencilShadow.cpp" />
<ClCompile Include="CTRTextureBlend.cpp" /> <ClCompile Include="CTRTextureBlend.cpp" />
<ClCompile Include="CTRTextureDetailMap2.cpp" /> <ClCompile Include="CTRTextureDetailMap2.cpp" />

6
source/Irrlicht/Irrlicht12.0.vcxproj.filters
View File

@ -1883,15 +1883,15 @@
<ClCompile Include="CTRGouraud2.cpp"> <ClCompile Include="CTRGouraud2.cpp">
<Filter>Irrlicht\video\Burning Video</Filter> <Filter>Irrlicht\video\Burning Video</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="CTRGouraudAlpha2.cpp">
<Filter>Irrlicht\video\Burning Video</Filter>
</ClCompile>
<ClCompile Include="CTRGouraudAlphaNoZ2.cpp"> <ClCompile Include="CTRGouraudAlphaNoZ2.cpp">
<Filter>Irrlicht\video\Burning Video</Filter> <Filter>Irrlicht\video\Burning Video</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="CTRNormalMap.cpp"> <ClCompile Include="CTRNormalMap.cpp">
<Filter>Irrlicht\video\Burning Video</Filter> <Filter>Irrlicht\video\Burning Video</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="CTRParallaxMap.cpp">
<Filter>Irrlicht\video\Burning Video</Filter>
</ClCompile>
<ClCompile Include="CTRStencilShadow.cpp"> <ClCompile Include="CTRStencilShadow.cpp">
<Filter>Irrlicht\video\Burning Video</Filter> <Filter>Irrlicht\video\Burning Video</Filter>
</ClCompile> </ClCompile>

2
source/Irrlicht/Irrlicht15.0.vcxproj
View File

@ -1343,7 +1343,6 @@
<ClCompile Include="CSkinnedMesh.cpp" /> <ClCompile Include="CSkinnedMesh.cpp" />
<ClCompile Include="CSTLMeshFileLoader.cpp" /> <ClCompile Include="CSTLMeshFileLoader.cpp" />
<ClCompile Include="CTRGouraudNoZ2.cpp" /> <ClCompile Include="CTRGouraudNoZ2.cpp" />
<ClCompile Include="CTRParallaxMap.cpp" />
<ClCompile Include="CTR_transparent_reflection_2_layer.cpp" /> <ClCompile Include="CTR_transparent_reflection_2_layer.cpp" />
<ClCompile Include="CWGLManager.cpp" /> <ClCompile Include="CWGLManager.cpp" />
<ClCompile Include="CXMeshFileLoader.cpp" /> <ClCompile Include="CXMeshFileLoader.cpp" />
@ -1449,6 +1448,7 @@
<ClCompile Include="CTRGouraud2.cpp" /> <ClCompile Include="CTRGouraud2.cpp" />
<ClCompile Include="CTRGouraudAlphaNoZ2.cpp" /> <ClCompile Include="CTRGouraudAlphaNoZ2.cpp" />
<ClCompile Include="CTRNormalMap.cpp" /> <ClCompile Include="CTRNormalMap.cpp" />
<ClCompile Include="CTRParallaxMap.cpp" />
<ClCompile Include="CTRStencilShadow.cpp" /> <ClCompile Include="CTRStencilShadow.cpp" />
<ClCompile Include="CTRTextureBlend.cpp" /> <ClCompile Include="CTRTextureBlend.cpp" />
<ClCompile Include="CTRTextureDetailMap2.cpp" /> <ClCompile Include="CTRTextureDetailMap2.cpp" />

6
source/Irrlicht/Irrlicht15.0.vcxproj.filters
View File

@ -1839,15 +1839,15 @@
<ClCompile Include="CTRGouraud2.cpp"> <ClCompile Include="CTRGouraud2.cpp">
<Filter>Irrlicht\video\Burning Video</Filter> <Filter>Irrlicht\video\Burning Video</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="CTRGouraudAlpha2.cpp">
<Filter>Irrlicht\video\Burning Video</Filter>
</ClCompile>
<ClCompile Include="CTRGouraudAlphaNoZ2.cpp"> <ClCompile Include="CTRGouraudAlphaNoZ2.cpp">
<Filter>Irrlicht\video\Burning Video</Filter> <Filter>Irrlicht\video\Burning Video</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="CTRNormalMap.cpp"> <ClCompile Include="CTRNormalMap.cpp">
<Filter>Irrlicht\video\Burning Video</Filter> <Filter>Irrlicht\video\Burning Video</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="CTRParallaxMap.cpp">
<Filter>Irrlicht\video\Burning Video</Filter>
</ClCompile>
<ClCompile Include="CTRStencilShadow.cpp"> <ClCompile Include="CTRStencilShadow.cpp">
<Filter>Irrlicht\video\Burning Video</Filter> <Filter>Irrlicht\video\Burning Video</Filter>
</ClCompile> </ClCompile>