LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-12 08:30:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Made love.vcproj buildable again.

Browse Source
This commit is contained in:
rude
2010-11-25 15:13:08 +01:00
parent fade6f0cbc
commit 6aa8399aa8
2 changed files with 219 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/msvc2008/love.vcproj
+216 -76
View File
@@ -733,6 +733,22 @@
RelativePath="..\..\src\modules\graphics\opengl\Font.h"
>
</File>
<File
RelativePath="..\..\src\modules\graphics\opengl\Framebuffer.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\graphics\opengl\Framebuffer.h"
>
</File>
<File
RelativePath="..\..\src\modules\graphics\opengl\GLee.c"
>
@@ -831,30 +847,6 @@
RelativePath="..\..\src\modules\graphics\opengl\Image.h"
>
</File>
<File
RelativePath="..\..\src\modules\graphics\opengl\ImageFont.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\ImageFont.h"
>
</File>
<File
RelativePath="..\..\src\modules\graphics\opengl\ParticleSystem.cpp"
>
@@ -927,30 +919,6 @@
RelativePath="..\..\src\modules\graphics\opengl\SpriteBatch.h"
>
</File>
<File
RelativePath="..\..\src\modules\graphics\opengl\TrueTypeFont.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\TrueTypeFont.h"
>
</File>
<File
RelativePath="..\..\src\modules\graphics\opengl\wrap_Font.cpp"
>
@@ -975,6 +943,22 @@
RelativePath="..\..\src\modules\graphics\opengl\wrap_Font.h"
>
</File>
<File
RelativePath="..\..\src\modules\graphics\opengl\wrap_Framebuffer.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\graphics\opengl\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\graphics\opengl\wrap_Framebuffer.h"
>
</File>
<File
RelativePath="..\..\src\modules\graphics\opengl\wrap_Glyph.cpp"
>
@@ -3301,10 +3285,194 @@
</File>
</Filter>
</Filter>
<Filter
Name="font"
>
<File
RelativePath="..\..\src\modules\font\Font.h"
>
</File>
<File
RelativePath="..\..\src\modules\font\FontData.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\font\FontData.h"
>
</File>
<File
RelativePath="..\..\src\modules\font\GlyphData.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\font\GlyphData.h"
>
</File>
<File
RelativePath="..\..\src\modules\font\ImageRasterizer.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\font\ImageRasterizer.h"
>
</File>
<File
RelativePath="..\..\src\modules\font\Rasterizer.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\font\Rasterizer.h"
>
</File>
<File
RelativePath="..\..\src\modules\font\wrap_FontData.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\font\wrap_FontData.h"
>
</File>
<File
RelativePath="..\..\src\modules\font\wrap_GlyphData.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\font\wrap_GlyphData.h"
>
</File>
<File
RelativePath="..\..\src\modules\font\wrap_Rasterizer.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\font\wrap_Rasterizer.h"
>
</File>
<Filter
Name="freetype"
>
<File
RelativePath="..\..\src\modules\font\freetype\Font.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\freetype\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\font\freetype\Font.h"
>
</File>
<File
RelativePath="..\..\src\modules\font\freetype\TrueTypeRasterizer.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\freetype\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\font\freetype\TrueTypeRasterizer.h"
>
</File>
<File
RelativePath="..\..\src\modules\font\freetype\wrap_Font.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\font\freetype\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\modules\font\freetype\wrap_Font.h"
>
</File>
</Filter>
</Filter>
</Filter>
<Filter
Name="common"
>
<File
RelativePath="..\..\src\common\b64.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\common\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\common\config.h"
>
@@ -3854,34 +4022,6 @@
Name="scripts"
>
</Filter>
<Filter
Name="resources"
>
<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"
>
</File>
</Filter>
<File
RelativePath=".\icon.rc"
>
src/modules/graphics/opengl/Font.cpp
+3 -3
View File
@@ -81,13 +81,13 @@ namespace opengl
for (unsigned int i = 0; i < text.size(); i++) {
unsigned char g = (unsigned char)text[i];
if (g == '\n') { // wrap newline, but do not print it
glTranslatef(-dx, round(getHeight()), 0);
glTranslatef(-dx, floor(getHeight() + 0.5f), 0);
dx = 0.0f;
continue;
}
if (!glyphs[g]) g = 32; // space
glPushMatrix();
if (type == FONT_TRUETYPE) glTranslatef(0, round(getHeight()), 0);
if (type == FONT_TRUETYPE) glTranslatef(0, floor(getHeight() + 0.5f), 0);
glyphs[g]->draw(0, 0, 0, 1, 1, 0, 0);
glPopMatrix();
glTranslatef(spacing[g], 0, 0);
@@ -100,7 +100,7 @@ namespace opengl
{
if (!glyphs[character]) character = ' ';
glPushMatrix();
glTranslatef(x, round(y+getHeight()), 0.0f);
glTranslatef(x, floor(y+getHeight() + 0.5f), 0.0f);
glCallList(list+character);
glPopMatrix();
}