Merge in minor branch, now minor is our next development target

This commit is contained in:
Bart van Strien
2011-05-07 14:12:41 +02:00
70 changed files with 3883 additions and 3571 deletions
+4 -12
View File
@@ -82,14 +82,12 @@
<ClCompile Include="..\..\src\modules\filesystem\physfs\wrap_File.cpp" />
<ClCompile Include="..\..\src\modules\filesystem\physfs\wrap_FileData.cpp" />
<ClCompile Include="..\..\src\modules\filesystem\physfs\wrap_Filesystem.cpp" />
<ClCompile Include="..\..\src\modules\font\FontData.cpp" />
<ClCompile Include="..\..\src\modules\font\freetype\Font.cpp" />
<ClCompile Include="..\..\src\modules\font\freetype\TrueTypeRasterizer.cpp" />
<ClCompile Include="..\..\src\modules\font\freetype\wrap_Font.cpp" />
<ClCompile Include="..\..\src\modules\font\GlyphData.cpp" />
<ClCompile Include="..\..\src\modules\font\ImageRasterizer.cpp" />
<ClCompile Include="..\..\src\modules\font\Rasterizer.cpp" />
<ClCompile Include="..\..\src\modules\font\wrap_FontData.cpp" />
<ClCompile Include="..\..\src\modules\font\wrap_GlyphData.cpp" />
<ClCompile Include="..\..\src\modules\font\wrap_Rasterizer.cpp" />
<ClCompile Include="..\..\src\modules\graphics\Drawable.cpp" />
@@ -100,7 +98,6 @@
<ClCompile Include="..\..\src\modules\graphics\opengl\GLee.c">
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TurnOffAllWarnings</WarningLevel>
</ClCompile>
<ClCompile Include="..\..\src\modules\graphics\opengl\Glyph.cpp" />
<ClCompile Include="..\..\src\modules\graphics\opengl\Graphics.cpp" />
<ClCompile Include="..\..\src\modules\graphics\opengl\Image.cpp" />
<ClCompile Include="..\..\src\modules\graphics\opengl\ParticleSystem.cpp" />
@@ -108,7 +105,6 @@
<ClCompile Include="..\..\src\modules\graphics\opengl\SpriteBatch.cpp" />
<ClCompile Include="..\..\src\modules\graphics\opengl\wrap_Font.cpp" />
<ClCompile Include="..\..\src\modules\graphics\opengl\wrap_Framebuffer.cpp" />
<ClCompile Include="..\..\src\modules\graphics\opengl\wrap_Glyph.cpp" />
<ClCompile Include="..\..\src\modules\graphics\opengl\wrap_Graphics.cpp" />
<ClCompile Include="..\..\src\modules\graphics\opengl\wrap_Image.cpp" />
<ClCompile Include="..\..\src\modules\graphics\opengl\wrap_ParticleSystem.cpp" />
@@ -117,9 +113,7 @@
<ClCompile Include="..\..\src\modules\graphics\Volatile.cpp" />
<ClCompile Include="..\..\src\modules\image\devil\Image.cpp" />
<ClCompile Include="..\..\src\modules\image\devil\ImageData.cpp" />
<ClCompile Include="..\..\src\modules\image\EncodedImageData.cpp" />
<ClCompile Include="..\..\src\modules\image\ImageData.cpp" />
<ClCompile Include="..\..\src\modules\image\wrap_EncodedImageData.cpp" />
<ClCompile Include="..\..\src\modules\image\wrap_Image.cpp" />
<ClCompile Include="..\..\src\modules\image\wrap_ImageData.cpp" />
<ClCompile Include="..\..\src\modules\joystick\Joystick.cpp" />
@@ -229,6 +223,10 @@
<ClInclude Include="..\..\src\common\version.h" />
<ClInclude Include="..\..\src\common\wrap_Data.h" />
<ClInclude Include="..\..\src\libraries\luasocket\luasocket.h" />
<ClInclude Include="..\..\src\libraries\utf8\utf8.h" />
<ClInclude Include="..\..\src\libraries\utf8\utf8\checked.h" />
<ClInclude Include="..\..\src\libraries\utf8\utf8\core.h" />
<ClInclude Include="..\..\src\libraries\utf8\utf8\unchecked.h" />
<ClInclude Include="..\..\src\modules\audio\Audio.h" />
<ClInclude Include="..\..\src\modules\audio\null\Audio.h" />
<ClInclude Include="..\..\src\modules\audio\null\Source.h" />
@@ -249,14 +247,12 @@
<ClInclude Include="..\..\src\modules\filesystem\physfs\wrap_FileData.h" />
<ClInclude Include="..\..\src\modules\filesystem\physfs\wrap_Filesystem.h" />
<ClInclude Include="..\..\src\modules\font\Font.h" />
<ClInclude Include="..\..\src\modules\font\FontData.h" />
<ClInclude Include="..\..\src\modules\font\freetype\Font.h" />
<ClInclude Include="..\..\src\modules\font\freetype\TrueTypeRasterizer.h" />
<ClInclude Include="..\..\src\modules\font\freetype\wrap_Font.h" />
<ClInclude Include="..\..\src\modules\font\GlyphData.h" />
<ClInclude Include="..\..\src\modules\font\ImageRasterizer.h" />
<ClInclude Include="..\..\src\modules\font\Rasterizer.h" />
<ClInclude Include="..\..\src\modules\font\wrap_FontData.h" />
<ClInclude Include="..\..\src\modules\font\wrap_GlyphData.h" />
<ClInclude Include="..\..\src\modules\font\wrap_Rasterizer.h" />
<ClInclude Include="..\..\src\modules\graphics\Drawable.h" />
@@ -265,7 +261,6 @@
<ClInclude Include="..\..\src\modules\graphics\opengl\Font.h" />
<ClInclude Include="..\..\src\modules\graphics\opengl\Framebuffer.h" />
<ClInclude Include="..\..\src\modules\graphics\opengl\GLee.h" />
<ClInclude Include="..\..\src\modules\graphics\opengl\Glyph.h" />
<ClInclude Include="..\..\src\modules\graphics\opengl\Graphics.h" />
<ClInclude Include="..\..\src\modules\graphics\opengl\Image.h" />
<ClInclude Include="..\..\src\modules\graphics\opengl\ParticleSystem.h" />
@@ -273,7 +268,6 @@
<ClInclude Include="..\..\src\modules\graphics\opengl\SpriteBatch.h" />
<ClInclude Include="..\..\src\modules\graphics\opengl\wrap_Font.h" />
<ClInclude Include="..\..\src\modules\graphics\opengl\wrap_Framebuffer.h" />
<ClInclude Include="..\..\src\modules\graphics\opengl\wrap_Glyph.h" />
<ClInclude Include="..\..\src\modules\graphics\opengl\wrap_Graphics.h" />
<ClInclude Include="..\..\src\modules\graphics\opengl\wrap_Image.h" />
<ClInclude Include="..\..\src\modules\graphics\opengl\wrap_ParticleSystem.h" />
@@ -282,10 +276,8 @@
<ClInclude Include="..\..\src\modules\graphics\Volatile.h" />
<ClInclude Include="..\..\src\modules\image\devil\Image.h" />
<ClInclude Include="..\..\src\modules\image\devil\ImageData.h" />
<ClInclude Include="..\..\src\modules\image\EncodedImageData.h" />
<ClInclude Include="..\..\src\modules\image\Image.h" />
<ClInclude Include="..\..\src\modules\image\ImageData.h" />
<ClInclude Include="..\..\src\modules\image\wrap_EncodedImageData.h" />
<ClInclude Include="..\..\src\modules\image\wrap_Image.h" />
<ClInclude Include="..\..\src\modules\image\wrap_ImageData.h" />
<ClInclude Include="..\..\src\modules\joystick\Joystick.h" />