From e96a17564ff7c11aa17028a85fae122e64462213 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 24 Oct 2001 22:29:38 +0000 Subject: [PATCH] Updates to the visual studio files for osgText. --- .../Demos/osgTextDemo/osgTextDemo.dsp | 37 ++-- VisualStudio/osgText/osgText.dsp | 191 ++++++++++++++++-- 2 files changed, 191 insertions(+), 37 deletions(-) diff --git a/VisualStudio/Demos/osgTextDemo/osgTextDemo.dsp b/VisualStudio/Demos/osgTextDemo/osgTextDemo.dsp index 9fbcc8ee3..b7683a853 100644 --- a/VisualStudio/Demos/osgTextDemo/osgTextDemo.dsp +++ b/VisualStudio/Demos/osgTextDemo/osgTextDemo.dsp @@ -42,15 +42,15 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x807 /d "NDEBUG" -# ADD RSC /l 0x807 /d "NDEBUG" +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 osgText.lib osgGlut.lib glut32.lib osgUtil.lib osgDB.lib osg.lib opengl32.lib glu32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"../../../../osgDev/bin/osgTextDemo.exe" +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../../bin/osgtext.exe" /libpath:"../../../lib" !ELSEIF "$(CFG)" == "osgTextDemo - Win32 Debug" @@ -65,16 +65,17 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vd0 /GR /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c -# ADD BASE RSC /l 0x807 /d "_DEBUG" -# ADD RSC /l 0x807 /d "_DEBUG" +# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /vd0 /GR /GX /Zi /Od /I "../../../include" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "FL_DLL" /FR /YX /FD /c +# ADD BASE RSC /l 0x809 /d "_DEBUG" +# ADD RSC /l 0x809 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 osgTextd.lib osgGlutd.lib glut32.lib osgUtild.lib osgDBd.lib osgd.lib opengl32.lib glu32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../../osgDev/bin/osgTextDemoD.exe" /pdbtype:sept +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 glut32.lib glu32.lib opengl32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/osgtextd.exe" /pdbtype:sept /libpath:"../../../lib" +# SUBTRACT LINK32 /incremental:no !ENDIF @@ -82,21 +83,13 @@ LINK32=link.exe # Name "osgTextDemo - Win32 Release" # Name "osgTextDemo - Win32 Debug" -# Begin Group "Quellcodedateien" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=..\..\..\src\Demos\osgText\main.cpp +SOURCE=..\..\..\src\Demos\osgtext\main.cpp # End Source File -# End Group -# Begin Group "Header-Dateien" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Ressourcendateien" +# End Target +# Begin Group "Resource Files" # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" # End Group -# End Target # End Project diff --git a/VisualStudio/osgText/osgText.dsp b/VisualStudio/osgText/osgText.dsp index 05ec3ff91..57683e253 100644 --- a/VisualStudio/osgText/osgText.dsp +++ b/VisualStudio/osgText/osgText.dsp @@ -33,7 +33,7 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" +# PROP BASE Output_Dir "../../lib" # PROP BASE Intermediate_Dir "Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 @@ -42,18 +42,18 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSGTEXT_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSGTEXT_LIBRARY" /YX /FD /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGTEXT_LIBRARY" /D "WIN32" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x807 /d "NDEBUG" -# ADD RSC /l 0x807 /d "NDEBUG" +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 ftglDllD.lib glu32.lib opengl32.lib osg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"../../../../osgDev/bin/osgText.dll" +# ADD LINK32 freetype204MT.lib /nologo /dll /pdb:none /machine:I386 /out:"../../bin/osgText.dll" /libpath:"../../lib" !ELSEIF "$(CFG)" == "osgText - Win32 Debug" @@ -68,18 +68,19 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSGTEXT_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vd0 /GR /GX /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "OSGTEXT_LIBRARY" /FR /YX /FD /GZ /c +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /vd0 /GR /GX /Zi /Od /I "../../include" /D "_DEBUG" /D "OSGTEXT_LIBRARY" /D "WIN32" /D "_WINDOWS" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x807 /d "_DEBUG" -# ADD RSC /l 0x807 /d "_DEBUG" +# ADD BASE RSC /l 0x809 /d "_DEBUG" +# ADD RSC /l 0x809 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 ftglDllD.lib glu32.lib opengl32.lib osgd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"C:\development\osgDev\osgDev\bin\osgTextD.dll" /pdbtype:sept +# ADD LINK32 freetype204MT.lib /nologo /dll /debug /machine:I386 /out:"../../bin/osgTextd.dll" /pdbtype:sept /libpath:"../../lib" +# SUBTRACT LINK32 /pdb:none !ENDIF @@ -87,17 +88,97 @@ LINK32=link.exe # Name "osgText - Win32 Release" # Name "osgText - Win32 Debug" -# Begin Group "Quellcodedateien" +# Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File +SOURCE=..\..\src\osgText\FTBitmapGlyph.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTCharmap.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTFace.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTFont.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTGLBitmapFont.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTGLOutlineFont.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTGLPixmapFont.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTGLPolygonFont.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTGLTextureFont.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTGlyph.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTGlyphContainer.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTLibrary.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTOutlineGlyph.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTPixmapGlyph.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTPolyGlyph.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTSize.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTTextureGlyph.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTVectorGlyph.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTVectoriser.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\Version.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\osgText\Text.cpp # End Source File # End Group -# Begin Group "Header-Dateien" +# Begin Group "Header Files" -# PROP Default_Filter "h;hpp;hxx;hm;inl" +# PROP Default_Filter ";h;hpp;hxx;hm;inl" # Begin Source File SOURCE=..\..\include\osgText\Export @@ -110,8 +191,88 @@ SOURCE=..\..\include\osgText\Text SOURCE=..\..\include\osgText\Version # End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTBitmapGlyph.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTCharmap.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTFace.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTFont.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTGL.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTGLBitmapFont.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTGLOutlineFont.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTGLPixmapFont.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTGLPolygonFont.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTGLTextureFont.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTGlyph.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTGlyphContainer.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTLibrary.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTOutlineGlyph.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTPixmapGlyph.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTPolyGlyph.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTSize.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTTextureGlyph.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTVectorGlyph.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgText\FTVectoriser.h +# End Source File # End Group -# Begin Group "Ressourcendateien" +# Begin Group "Resource Files" # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" # End Group