Fixed epic bug in runtime.cpp causing non-Lua-owned objects to be released by Lua GC.

This commit is contained in:
rude
2009-09-05 16:14:52 +02:00
parent fea48f421c
commit 3c2bd1bd9c
12 changed files with 1038 additions and 10 deletions
+128
View File
@@ -157,6 +157,22 @@
<File
RelativePath="..\..\..\src\common\Exception.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\common\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\common\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\common\Exception.h"
@@ -169,6 +185,22 @@
<File
RelativePath="..\..\..\src\common\Matrix.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\common\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\common\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\common\Matrix.h"
@@ -177,6 +209,22 @@
<File
RelativePath="..\..\..\src\common\MemoryData.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\common\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\common\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\common\MemoryData.h"
@@ -189,6 +237,22 @@
<File
RelativePath="..\..\..\src\common\Object.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\common\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\common\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\common\Object.h"
@@ -197,6 +261,22 @@
<File
RelativePath="..\..\..\src\common\Reference.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\common\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\common\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\common\Reference.h"
@@ -205,6 +285,22 @@
<File
RelativePath="..\..\..\src\common\runtime.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\common\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\common\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\common\runtime.h"
@@ -217,6 +313,22 @@
<File
RelativePath="..\..\..\src\common\Vector.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\common\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\common\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\common\Vector.h"
@@ -229,6 +341,22 @@
<File
RelativePath="..\..\..\src\common\wrap_Data.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\common\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\common\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\common\wrap_Data.h"
@@ -175,6 +175,22 @@
<File
RelativePath="..\..\..\src\modules\filesystem\physfs\File.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\filesystem\physfs\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\filesystem\physfs\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\filesystem\physfs\File.h"
@@ -183,6 +199,22 @@
<File
RelativePath="..\..\..\src\modules\filesystem\physfs\Filesystem.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\filesystem\physfs\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\filesystem\physfs\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\filesystem\physfs\Filesystem.h"
@@ -191,6 +223,22 @@
<File
RelativePath="..\..\..\src\modules\filesystem\physfs\wrap_File.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\filesystem\physfs\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\filesystem\physfs\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\filesystem\physfs\wrap_File.h"
@@ -199,6 +247,22 @@
<File
RelativePath="..\..\..\src\modules\filesystem\physfs\wrap_FileData.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\filesystem\physfs\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\filesystem\physfs\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\filesystem\physfs\wrap_FileData.h"
@@ -207,6 +271,22 @@
<File
RelativePath="..\..\..\src\modules\filesystem\physfs\wrap_Filesystem.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\filesystem\physfs\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\filesystem\physfs\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\filesystem\physfs\wrap_Filesystem.h"
@@ -220,6 +300,22 @@
<File
RelativePath="..\..\..\src\modules\filesystem\FileData.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\filesystem\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\filesystem\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\filesystem\FileData.h"
+69 -5
View File
@@ -183,6 +183,14 @@
ObjectFile="$(IntDir)\font\freetype\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\freetype\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\font\freetype\Font.h"
@@ -199,6 +207,14 @@
ObjectFile="$(IntDir)\font\freetype\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\freetype\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\font\freetype\TrueTypeRasterizer.h"
@@ -215,6 +231,14 @@
ObjectFile="$(IntDir)\font\freetype\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\freetype\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\font\freetype\wrap_Font.h"
@@ -229,7 +253,15 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\freetype\"
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
</File>
@@ -245,7 +277,15 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\freetype\"
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
</File>
@@ -261,7 +301,15 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\freetype\"
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
</File>
@@ -277,7 +325,15 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\freetype\"
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
</File>
@@ -293,7 +349,15 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\freetype\"
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
</File>
+161 -1
View File
@@ -180,7 +180,15 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
@@ -195,6 +203,14 @@
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\graphics\opengl\Font.h"
@@ -212,6 +228,14 @@
WarningLevel="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\graphics\opengl\GLee.h"
@@ -228,6 +252,14 @@
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\graphics\opengl\Glyph.h"
@@ -244,6 +276,14 @@
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\graphics\opengl\Graphics.h"
@@ -260,6 +300,14 @@
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\graphics\opengl\Image.h"
@@ -276,6 +324,14 @@
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\graphics\opengl\ImageFont.h"
@@ -292,6 +348,14 @@
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\graphics\opengl\ParticleSystem.h"
@@ -300,6 +364,22 @@
<File
RelativePath="..\..\..\src\modules\graphics\opengl\Quad.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\graphics\opengl\Quad.h"
@@ -316,6 +396,14 @@
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\graphics\opengl\SpriteBatch.h"
@@ -332,6 +420,14 @@
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\graphics\opengl\TrueTypeFont.h"
@@ -348,6 +444,14 @@
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\graphics\opengl\wrap_Font.h"
@@ -364,6 +468,14 @@
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\graphics\opengl\wrap_Glyph.h"
@@ -380,6 +492,14 @@
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\graphics\opengl\wrap_Graphics.h"
@@ -396,6 +516,14 @@
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\graphics\opengl\wrap_Image.h"
@@ -412,6 +540,14 @@
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\graphics\opengl\wrap_ParticleSystem.h"
@@ -420,6 +556,22 @@
<File
RelativePath="..\..\..\src\modules\graphics\opengl\wrap_Quad.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\graphics\opengl\wrap_Quad.h"
@@ -436,6 +588,14 @@
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\graphics\opengl\wrap_SpriteBatch.h"
+8
View File
@@ -205,6 +205,14 @@
>
</File>
</Filter>
<File
RelativePath="..\..\..\src\modules\image\EncodedImageData.cpp"
>
</File>
<File
RelativePath="..\..\..\src\modules\image\EncodedImageData.h"
>
</File>
<File
RelativePath="..\..\..\src\modules\image\Image.h"
>
+296
View File
@@ -605,6 +605,22 @@
<File
RelativePath="..\..\src\modules\filesystem\FileData.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\filesystem\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\filesystem\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\filesystem\FileData.h"
@@ -848,6 +864,22 @@
<File
RelativePath="..\..\src\modules\graphics\opengl\Glyph.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\graphics\opengl\Glyph.h"
@@ -936,6 +968,14 @@
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\graphics\opengl\ParticleSystem.h"
@@ -944,6 +984,22 @@
<File
RelativePath="..\..\src\modules\graphics\opengl\Quad.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\graphics\opengl\Quad.h"
@@ -952,6 +1008,22 @@
<File
RelativePath="..\..\src\modules\graphics\opengl\SpriteBatch.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\graphics\opengl\SpriteBatch.h"
@@ -1008,6 +1080,22 @@
<File
RelativePath="..\..\src\modules\graphics\opengl\wrap_Glyph.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\graphics\opengl\wrap_Glyph.h"
@@ -1072,6 +1160,14 @@
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\graphics\opengl\wrap_ParticleSystem.h"
@@ -1080,6 +1176,22 @@
<File
RelativePath="..\..\src\modules\graphics\opengl\wrap_Quad.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\graphics\opengl\wrap_Quad.h"
@@ -1088,6 +1200,22 @@
<File
RelativePath="..\..\src\modules\graphics\opengl\wrap_SpriteBatch.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\graphics\opengl\wrap_SpriteBatch.h"
@@ -1098,6 +1226,30 @@
<Filter
Name="image"
>
<File
RelativePath="..\..\src\modules\image\EncodedImageData.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\image\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\image\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\image\EncodedImageData.h"
>
</File>
<File
RelativePath="..\..\src\modules\image\Image.h"
>
@@ -1520,6 +1672,22 @@
<File
RelativePath="..\..\src\modules\physics\box2d\GearJoint.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\physics\box2d\GearJoint.h"
@@ -1840,6 +2008,22 @@
<File
RelativePath="..\..\src\modules\physics\box2d\wrap_GearJoint.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\physics\box2d\wrap_GearJoint.h"
@@ -3167,6 +3351,14 @@
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\font\GlyphData.h"
@@ -3183,6 +3375,14 @@
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\font\ImageRasterizer.h"
@@ -3199,6 +3399,14 @@
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\font\Rasterizer.h"
@@ -3215,6 +3423,14 @@
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\font\wrap_GlyphData.h"
@@ -3231,6 +3447,14 @@
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\font\wrap_Rasterizer.h"
@@ -3250,6 +3474,14 @@
ObjectFile="$(IntDir)\font\freetype\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\freetype\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\font\freetype\Font.h"
@@ -3266,6 +3498,14 @@
ObjectFile="$(IntDir)\font\freetype\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\freetype\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\font\freetype\TrueTypeRasterizer.h"
@@ -3282,6 +3522,14 @@
ObjectFile="$(IntDir)\font\freetype\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\freetype\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\font\freetype\wrap_Font.h"
@@ -3412,6 +3660,22 @@
<File
RelativePath="..\..\src\common\MemoryData.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\common\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\common\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\common\MemoryData.h"
@@ -3948,6 +4212,22 @@
<File
RelativePath="..\..\src\resources\resources.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\resources\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\resources\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\resources\resources.h"
@@ -3957,6 +4237,22 @@
<File
RelativePath="..\..\src\love.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\love\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\"
/>
</FileConfiguration>
</File>
</Files>
<Globals>
+32
View File
@@ -173,6 +173,22 @@
<File
RelativePath="..\..\..\src\resources\resources.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\lovedll\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\lovedll\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\resources\resources.h"
@@ -182,6 +198,22 @@
<File
RelativePath="..\..\..\src\love.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\lovedll\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\lovedll\"
/>
</FileConfiguration>
</File>
</Files>
<Globals>
+16
View File
@@ -183,6 +183,14 @@
ObjectFile="$(IntDir)\native\tcc\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\native\tcc\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\native\tcc\api.h"
@@ -235,6 +243,14 @@
WarningLevel="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\native\tcc\libtcc\"
/>
</FileConfiguration>
</File>
</Filter>
</Filter>
+224
View File
@@ -183,6 +183,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\Body.h"
@@ -199,6 +207,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\CircleShape.h"
@@ -215,6 +231,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\Contact.h"
@@ -231,6 +255,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\DistanceJoint.h"
@@ -247,6 +279,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\GearJoint.h"
@@ -263,6 +303,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\Joint.h"
@@ -279,6 +327,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\MouseJoint.h"
@@ -295,6 +351,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\Physics.h"
@@ -311,6 +375,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\PolygonShape.h"
@@ -327,6 +399,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\PrismaticJoint.h"
@@ -343,6 +423,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\PulleyJoint.h"
@@ -359,6 +447,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\RevoluteJoint.h"
@@ -375,6 +471,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\Shape.h"
@@ -391,6 +495,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\World.h"
@@ -407,6 +519,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\wrap_Body.h"
@@ -423,6 +543,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\wrap_CircleShape.h"
@@ -439,6 +567,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\wrap_Contact.h"
@@ -455,6 +591,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\wrap_DistanceJoint.h"
@@ -471,6 +615,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\wrap_GearJoint.h"
@@ -487,6 +639,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\wrap_Joint.h"
@@ -503,6 +663,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\wrap_MouseJoint.h"
@@ -519,6 +687,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\wrap_Physics.h"
@@ -535,6 +711,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\wrap_PolygonShape.h"
@@ -551,6 +735,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\wrap_PrismaticJoint.h"
@@ -567,6 +759,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\wrap_PulleyJoint.h"
@@ -583,6 +783,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\wrap_RevoluteJoint.h"
@@ -599,6 +807,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\wrap_Shape.h"
@@ -615,6 +831,14 @@
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\physics\box2d\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\modules\physics\box2d\wrap_World.h"
+2
View File
@@ -47,6 +47,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
ObjectFile="$(IntDir)\physics\box2d\"
WarningLevel="3"
DebugInformationFormat="4"
/>
@@ -121,6 +122,7 @@
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
ObjectFile="$(IntDir)\physics\box2d\"
WarningLevel="3"
DebugInformationFormat="3"
/>
+4 -3
View File
@@ -37,9 +37,10 @@ namespace love
**/
static int w__gc(lua_State * L)
{
Proxy * u = (Proxy *)lua_touserdata(L, 1);
Object * t = (Object *)u->data;
t->release();
Proxy * p = (Proxy *)lua_touserdata(L, 1);
Object * t = (Object *)p->data;
if(p->own)
t->release();
return 0;
}
+2 -1
View File
@@ -171,6 +171,7 @@ namespace devil
ILuint h = d->getHeight();
int headerLen, bpp;
switch (f) {
case Image::FORMAT_TGA: // MSVC issues warning when there's no case statement.
default: // since we only support one format
headerLen = 18;
bpp = 3;
@@ -202,7 +203,7 @@ namespace devil
ILubyte * temp = new ILubyte[row];
ILubyte * src = data - row;
ILubyte * dst = data + size;
for (int i = 0; i < (h >> 1); i++) {
for (unsigned i = 0; i < (h >> 1); i++) {
memcpy(temp,src+=row,row);
memcpy(src,dst-=row,row);
memcpy(dst,temp,row);