diff options
| author | Rob Haarsma <phaseIV@zonnet.nl> | 2005-01-21 17:43:21 +0300 |
|---|---|---|
| committer | Rob Haarsma <phaseIV@zonnet.nl> | 2005-01-21 17:43:21 +0300 |
| commit | 465b15eb695ef96534b008199fa90af0936febde (patch) | |
| tree | a66a234969d79716cd31d9bbca4dec2e1fd230a8 /extern | |
| parent | 64ef688695f0cae6c15ee3baf52e6be99191f221 (diff) | |
Modified FTGL for proper texturefont support.
Also fixed msvc6 (release only) projectfile to build and output correctly.
Diffstat (limited to 'extern')
| -rwxr-xr-x | extern/bFTGL/src/FTGLTextureFont.cpp | 4 | ||||
| -rw-r--r-- | extern/bFTGL/win32_vcpp/ftgl_static_lib/ftgl_static_lib.dsp | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/extern/bFTGL/src/FTGLTextureFont.cpp b/extern/bFTGL/src/FTGLTextureFont.cpp index aa6b645d3ab..6be32a2fb3b 100755 --- a/extern/bFTGL/src/FTGLTextureFont.cpp +++ b/extern/bFTGL/src/FTGLTextureFont.cpp @@ -128,8 +128,8 @@ GLuint FTGLTextureFont::CreateTexture() glBindTexture( GL_TEXTURE_2D, textID); glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexImage2D( GL_TEXTURE_2D, 0, GL_ALPHA, textureWidth, textureHeight, 0, GL_ALPHA, GL_UNSIGNED_BYTE, textureMemory); diff --git a/extern/bFTGL/win32_vcpp/ftgl_static_lib/ftgl_static_lib.dsp b/extern/bFTGL/win32_vcpp/ftgl_static_lib/ftgl_static_lib.dsp index 06ca55c1901..bc2c77cb0b6 100644 --- a/extern/bFTGL/win32_vcpp/ftgl_static_lib/ftgl_static_lib.dsp +++ b/extern/bFTGL/win32_vcpp/ftgl_static_lib/ftgl_static_lib.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release_ST" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "D:\cots\freetype-2.0.5\include" /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FTGL_LIBRARY_STATIC" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\freetype\include" /I "..\..\include" /I "..\..\..\..\..\lib\windows\freetype\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FTGL_LIBRARY_STATIC" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -51,7 +51,11 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\Build\ftgl_static_MT.lib" +# ADD LIB32 /nologo /out:"..\Build\ftgl_static_ST.lib" +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=ECHO Copying lib to lib\windows\ftgl\lib XCOPY /Y ..\Build\*lib ..\..\..\..\..\lib\windows\ftgl\lib +# End Special Build Tool !ELSEIF "$(CFG)" == "ftgl_static_lib - Win32 Debug" |