Commit fe058a591f1495c2dbea7ca95fbd2a70731a03ba
2010-05-23T19:55:26
Bring the VS 2003 build up to date, courtesy of Lars Huttar in SF bug #2027775.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55
diff --git a/msvc/vc71/ftgl_dll.vcproj b/msvc/vc71/ftgl_dll.vcproj
index 2868153..bcad03a 100644
--- a/msvc/vc71/ftgl_dll.vcproj
+++ b/msvc/vc71/ftgl_dll.vcproj
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(FREETYPE)/include";../;../../src/"
+ AdditionalIncludeDirectories=""$(FREETYPE)/include";"$(FREETYPE)/include/freetype2";../;../../src/"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTGL_LIBRARY"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -33,14 +33,14 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib opengl32.lib glu32.lib freetype234_D.lib"
- OutputFile="../Build/ftgl_D.dll"
+ AdditionalDependencies="odbc32.lib odbccp32.lib opengl32.lib glu32.lib freetype.lib"
+ OutputFile="../Build/ftgl_d.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="$(FREETYPE)/objs"
+ AdditionalLibraryDirectories="$(FREETYPE)/lib"
GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="../Build/ftgl_D.pdb"
+ ProgramDatabaseFile="../Build/ftgl_d.pdb"
SubSystem="2"
- ImportLibrary="../Build/ftgl_D.lib"
+ ImportLibrary="../Build/ftgl_d.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
@@ -71,7 +71,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(FREETYPE)/include";../;../../src/"
+ AdditionalIncludeDirectories=""$(FREETYPE)/include";"$(FREETYPE)/include/freetype2";../;../../src/"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTGL_LIBRARY"
RuntimeLibrary="2"
RuntimeTypeInfo="TRUE"
@@ -83,10 +83,10 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib opengl32.lib glu32.lib freetype234.lib"
+ AdditionalDependencies="odbc32.lib odbccp32.lib opengl32.lib glu32.lib freetype.lib"
OutputFile="../Build/ftgl.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="$(FREETYPE)/objs"
+ AdditionalLibraryDirectories="$(FREETYPE)/lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="../Build/ftgl.pdb"
SubSystem="2"