*** empty log message ***

4 files changed, 575 insertions, 2 deletions

diff --git a/mak.vc9/cd.sln b/mak.vc9/cd.sln
index 9a861fb..1713e1a 100644
--- a/mak.vc9/cd.sln
+++ b/mak.vc9/cd.sln
@@ -134,6 +134,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluaim52", "cdluaim52.vcpr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluapdf52", "cdluapdf52.vcproj", "{B4823266-DF8C-ABC1-DF8C-12688C234EAC}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdgl", "cdgl.vcproj", "{8441F69D-7135-AB59-1F94-4522123C8467}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftgl", "cd_ftgl.vcproj", "{1D758EEA-59C3-46E4-BEF5-16DCCA8C0B21}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -189,6 +193,10 @@ Global
 		{CB863607-6B6C-FF53-DF34-12AA00001234}.Debug|Win32.Build.0 = Debug|Win32
 		{B4823266-DF8C-ABC1-DF8C-12688C234EAC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B4823266-DF8C-ABC1-DF8C-12688C234EAC}.Debug|Win32.Build.0 = Debug|Win32
+		{8441F69D-7135-AB59-1F94-4522123C8467}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8441F69D-7135-AB59-1F94-4522123C8467}.Debug|Win32.Build.0 = Debug|Win32
+		{1D758EEA-59C3-46E4-BEF5-16DCCA8C0B21}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1D758EEA-59C3-46E4-BEF5-16DCCA8C0B21}.Debug|Win32.Build.0 = Debug|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/mak.vc9/cd_ftgl.vcproj b/mak.vc9/cd_ftgl.vcproj
new file mode 100644
index 0000000..6e0a829
--- /dev/null
+++ b/mak.vc9/cd_ftgl.vcproj
@@ -0,0 +1,458 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="ftgl"
+	ProjectGUID="{1D758EEA-59C3-46E4-BEF5-16DCCA8C0B21}"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\lib"
+			IntermediateDirectory="..\obj\Debug\$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../src/ftgl;../src/freetype2"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FTGL_LIBRARY_STATIC"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="1"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/$(ProjectName).lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\src\ftgl\FTBuffer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ftgl\FTCharmap.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ftgl\FTContour.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ftgl\FTFace.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ftgl\FTGlyphContainer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ftgl\FTLibrary.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ftgl\FTPoint.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ftgl\FTSize.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ftgl\FTVectoriser.cpp"
+				>
+			</File>
+			<Filter
+				Name="FTFont"
+				>
+				<File
+					RelativePath="..\src\ftgl\FTFont\FTBitmapFont.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTFont\FTBufferFont.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTFont\FTExtrudeFont.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTFont\FTFont.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTFont\FTFontGlue.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTFont\FTOutlineFont.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTFont\FTPixmapFont.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTFont\FTPolygonFont.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTFont\FTTextureFont.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="FTGlyph"
+				>
+				<File
+					RelativePath="..\src\ftgl\FTGlyph\FTBitmapGlyph.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGlyph\FTBufferGlyph.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGlyph\FTExtrudeGlyph.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGlyph\FTGlyph.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGlyph\FTGlyphGlue.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGlyph\FTOutlineGlyph.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGlyph\FTPixmapGlyph.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGlyph\FTPolygonGlyph.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGlyph\FTTextureGlyph.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="FTLayout"
+				>
+				<File
+					RelativePath="..\src\ftgl\FTLayout\FTLayout.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTLayout\FTLayoutGlue.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTLayout\FTSimpleLayout.cpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\src\ftgl\FTCharmap.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ftgl\FTCharToGlyphIndexMap.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ftgl\FTContour.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ftgl\FTFace.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ftgl\FTGlyphContainer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ftgl\FTInternals.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ftgl\FTLibrary.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ftgl\FTList.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ftgl\FTSize.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ftgl\FTUnicode.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ftgl\FTVector.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ftgl\FTVectoriser.h"
+				>
+			</File>
+			<Filter
+				Name="FTFont"
+				>
+				<File
+					RelativePath="..\src\ftgl\FTFont\FTBitmapFontImpl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTFont\FTBufferFontImpl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTFont\FTExtrudeFontImpl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTFont\FTFontImpl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTFont\FTOutlineFontImpl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTFont\FTPixmapFontImpl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTFont\FTPolygonFontImpl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTFont\FTTextureFontImpl.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="FTGlyph"
+				>
+				<File
+					RelativePath="..\src\ftgl\FTGlyph\FTBitmapGlyphImpl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGlyph\FTBufferGlyphImpl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGlyph\FTExtrudeGlyphImpl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGlyph\FTGlyphImpl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGlyph\FTOutlineGlyphImpl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGlyph\FTPixmapGlyphImpl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGlyph\FTPolygonGlyphImpl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGlyph\FTTextureGlyphImpl.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="FTGL"
+				>
+				<File
+					RelativePath="..\src\ftgl\FTGL\FTBBox.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGL\FTBitmapGlyph.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGL\FTBuffer.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGL\FTBufferFont.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGL\FTBufferGlyph.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGL\FTExtrdGlyph.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGL\FTFont.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGL\ftgl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGL\FTGLBitmapFont.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGL\FTGLExtrdFont.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGL\FTGLOutlineFont.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGL\FTGLPixmapFont.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGL\FTGLPolygonFont.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGL\FTGLTextureFont.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGL\FTGlyph.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGL\FTLayout.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGL\FTOutlineGlyph.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGL\FTPixmapGlyph.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGL\FTPoint.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGL\FTPolyGlyph.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGL\FTSimpleLayout.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTGL\FTTextureGlyph.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="FTLayout"
+				>
+				<File
+					RelativePath="..\src\ftgl\FTLayout\FTLayoutImpl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\ftgl\FTLayout\FTSimpleLayoutImpl.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/mak.vc9/cdgl.vcproj b/mak.vc9/cdgl.vcproj
new file mode 100644
index 0000000..4f676b3
--- /dev/null
+++ b/mak.vc9/cdgl.vcproj
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="cdgl"
+	ProjectGUID="{8441F69D-7135-AB59-1F94-4522123C8467}"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\lib"
+			IntermediateDirectory="..\obj\Debug\$(ProjectName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\include;..\src;..\src\sim;..\src\ftgl;../src/freetype2"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;CD_NO_OLD_INTERFACE;_CRT_SECURE_NO_DEPRECATE;FTGL_LIBRARY_STATIC"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="1"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1046"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/$(ProjectName).lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\src\drv\cdgl.c"
+			>
+		</File>
+		<File
+			RelativePath="..\src\cdgl.def"
+			>
+		</File>
+		<File
+			RelativePath="..\include\cdgl.h"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/mak.vc9/cdsimple.vcproj b/mak.vc9/cdsimple.vcproj
index 0afcf41..e5746d6 100644
--- a/mak.vc9/cdsimple.vcproj
+++ b/mak.vc9/cdsimple.vcproj
@@ -44,7 +44,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\include,..\..\iup\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;__CD__;simple;_CRT_SECURE_NO_DEPRECATE;USE_CONTEXTPLUS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;__CD__;simple;_CRT_SECURE_NO_DEPRECATE;USE_CONTEXTPLUS;USE_OPENGL"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				PrecompiledHeaderFile=".\..\obj\cdsimple/cdsimple.pch"
@@ -70,7 +70,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="freetype6.lib cd.lib iupcd.lib iup.lib comctl32.lib cdcontextplus.lib gdiplus.lib cdpdf.lib pdflib.lib iupcontrols.lib"
+				AdditionalDependencies="freetype6.lib cd.lib iupcd.lib iup.lib comctl32.lib cdcontextplus.lib gdiplus.lib cdpdf.lib pdflib.lib iupcontrols.lib iupgl.lib opengl32.lib glu32.lib cdgl.lib ftgl.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"