Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-07-07 00:36:00 +02:00
Code Activity

Fixed build paths, added comparison warnings, other misc fixes

Browse source
This commit is contained in:
Brian Fiete 2019-10-05 10:26:26 -07:00
parent dae5c6cee4
commit f4c252048e
19 changed files with 231 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BeefySysLib/BeefySysLib_static.vcxproj
View file

@ -79,6 +79,7 @@
<TargetName>$(ProjectName)_d</TargetName>
<LibraryPath>third_party\AK\lib\debug;C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2007%29\Lib\x86;$(LibraryPath);$(WindowsSDK_LibraryPath_x86)</LibraryPath>
<IntDir>$(Platform)\$(Configuration)_static\</IntDir>
<OutDir>$(SolutionDir)\ide\dist\$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
@ -90,6 +91,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<IntDir>$(Platform)\$(Configuration)_static\</IntDir>
<OutDir>$(SolutionDir)\ide\dist\$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>

4
BeefySysLib/gfx/FTFont.cpp
View file

@ -120,6 +120,7 @@ void FTFontManager::ClearCache()
FTFontManager::Page::~Page()
{
mTexture->Release();
//delete mTexture;
}
@ -266,8 +267,7 @@ FTFontManager::Glyph* FTFont::AllocGlyph(int charCode, bool allowDefault)
else
img.mBits[i] = 0xFF0000FF;
}
page->mTexture = gBFApp->mRenderDevice->LoadTexture(&img, TextureFlag_NoPremult);
page->mTexture->mRefCount = 0;
page->mTexture = gBFApp->mRenderDevice->LoadTexture(&img, TextureFlag_NoPremult);
}
if (bitmap.width > 0)

2
BeefySysLib/util/BeefPerf.cpp
View file

@ -1781,4 +1781,4 @@ BP_EXPORT const char* BP_CALLTYPE BpDynStr(const char* str)
return str;
}
#endif
#endif