Commit cd5b52515ac6fd79a4abdb45100b572d82c5095f

sammy 2009-07-20T12:22:22

Bring the Visual Studio 2008 solution up to date.

diff --git a/msvc/README.txt b/msvc/README.txt
index 916b37f..9683f37 100644
--- a/msvc/README.txt
+++ b/msvc/README.txt
@@ -1,20 +1,40 @@
-FTGL Version 2.0
+Using FTGL and Visual Studio
+============================
 
-FTGL on windows can be built a ether a dynamic link library (DLL) with export lib (lib)
-or a static library (lib). All files will be built in the build directory that will be created in this
-directory.
+FTGL on windows can be built a ether a dynamic link library (DLL) with export
+lib (lib) or a static library (lib). All files will be built in the "build"
+subdirectory that will be created in this directory.
 
-FTGL requires the Freetype2 library (version 2.3.5 r).
-You will need to define the environment variable
-FREETYPE to contain the full path to your freetype2 sources.
+FTGL requires the Freetype2 library (version 2.3.9).
 
-the VC8 dir contains projects for use with Visual C++ 2005 and 2008, and can build
-both the dynamic and static libs.
+Set up FreeType2
+----------------
 
-the VC71 dir contains projects for use with Visual C++ 2003 and can only build a dynamic lib.
+You will need to download the FreeType sources from http://www.freetype.org/,
+or directly from git://git.sv.nongnu.org/freetype/freetype2.git if you have
+installed Git.
+
+Open the Visual Studio solution and build FreeType.
+
+Finally, define the FREETYPE environment variable to the full path to your
+FreeType sources, eg. C:\Users\john\Desktop\freetype
+
+Build FTGL
+----------
+
+The "vc9" directory contains projects for use with Visual Studio 2008. The
+"vc8" directory contains projects for Visual Studio 2005. These projects can
+build both the dynamic and static libraries.
+
+The "vc71" directory contains projects for use with Visual C++ 2003 and can
+only build a dynamic library. It is no longer supported.
+
+Use FTGL
+--------
+
+To use FTGL in your own projects you will need to link against either the
+static lib, or the DLL export lib. All builds use the multithreaded runtime.
 
-To use FTGL in your own projects you will need to link against ether the static lib, or the DLL export lib
-All builds use the multithreaded runtimes.
 Your project will also need to include freetype2 and OpenGL.
 
 For instructions on using Freetype go to www.freetype.org
diff --git a/msvc/vc9/ftgl.sln b/msvc/vc9/ftgl.sln
index b2dcac6..459c223 100644
--- a/msvc/vc9/ftgl.sln
+++ b/msvc/vc9/ftgl.sln
@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftgl_dll", "ftgl_dll.vcproj", "{F7946C68-319D-441A-A732-BC2A200A9112}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftgl_static", "ftgl_static.vcproj", "{1D758EEA-59C3-46E4-BEF5-16DCCA8C0B21}"
diff --git a/msvc/vc9/ftgl_dll.vcproj b/msvc/vc9/ftgl_dll.vcproj
index 0965a9d..b95b5ab 100644
--- a/msvc/vc9/ftgl_dll.vcproj
+++ b/msvc/vc9/ftgl_dll.vcproj
@@ -50,7 +50,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(FREETYPE)/include,../../src,../"
+				AdditionalIncludeDirectories="$(FREETYPE)/include;../../src;../"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;FTGL_LIBRARY"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -75,11 +75,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib opengl32.lib glu32.lib freetype235.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib opengl32.lib glu32.lib freetype239.lib"
 				OutputFile="../Build/ftgl.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(FREETYPE)/objs"
+				AdditionalLibraryDirectories="$(FREETYPE)/objs/win32/vc2008"
 				ProgramDatabaseFile="../Build/ftgl.pdb"
 				ImportLibrary="../Build/ftgl.lib"
 				TargetMachine="1"
@@ -105,9 +105,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -145,7 +142,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(FREETYPE)/include&quot;;../../src;../"
+				AdditionalIncludeDirectories="$(FREETYPE)/include;../../src;../"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;FTGL_LIBRARY"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -171,11 +168,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib opengl32.lib glu32.lib freetype234_D.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib opengl32.lib glu32.lib freetype239_D.lib"
 				OutputFile="../Build/ftgl_D.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(FREETYPE)/objs"
+				AdditionalLibraryDirectories="$(FREETYPE)/objs/win32/vc2008"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="../Build/ftgl_D.pdb"
 				ImportLibrary="../Build/ftgl_D.lib"
@@ -202,9 +199,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
diff --git a/msvc/vc9/ftgl_static.vcproj b/msvc/vc9/ftgl_static.vcproj
index d52541e..4b5a2d1 100644
--- a/msvc/vc9/ftgl_static.vcproj
+++ b/msvc/vc9/ftgl_static.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../;../../src/;&quot;$(FREETYPE)/include&quot;"
+				AdditionalIncludeDirectories="$(FREETYPE)/include;../../src/;../"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FTGL_LIBRARY_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -105,7 +105,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../;../../src/;&quot;$(FREETYPE)/include&quot;"
+				AdditionalIncludeDirectories="$(FREETYPE)/include;../../src/;../"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;FTGL_LIBRARY_STATIC"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -523,7 +523,7 @@
 			</Filter>
 		</Filter>
 		<File
-			RelativePath=".\ReadMe.txt"
+			RelativePath="..\README.txt"
 			>
 		</File>
 	</Files>