Commit f3211b08f4914e7aabbb03ff7e35dee8aebe9011
2008-05-06T21:43:37
make the windows demo build (on vc8 at least)
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 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81
diff --git a/msvc/demo.cpp b/msvc/demo.cpp
index c5901e8..2d7c7a7 100644
--- a/msvc/demo.cpp
+++ b/msvc/demo.cpp
@@ -14,15 +14,7 @@
-#include "FTGLOutlineFont.h"
-
-#include "FTGLPolygonFont.h"
-
-#include "FTGLBitmapFont.h"
-
-#include "FTGLTextureFont.h"
-
-#include "FTGLPixmapFont.h"
+#include <FTGL/ftgl.h>
diff --git a/msvc/vc8/ftgl_demo.vcproj b/msvc/vc8/ftgl_demo.vcproj
index eb2c178..6622bde 100644
--- a/msvc/vc8/ftgl_demo.vcproj
+++ b/msvc/vc8/ftgl_demo.vcproj
@@ -4,6 +4,7 @@
Version="8.00"
Name="ftgl_demo"
ProjectGUID="{2D3BEF21-ACA4-4D78-AFD0-C84EB081BF21}"
+ RootNamespace="ftgl_demo"
>
<Platforms>
<Platform
@@ -43,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="D:\cots\freetype-2.0.5\include,..\include"
+ AdditionalIncludeDirectories=""$(FREETYPE)/include",..\include"
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;FTGL_LIBRARY_STATIC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -137,7 +138,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="D:\cots\freetype-2.0.5\include,..\include"
+ AdditionalIncludeDirectories=""$(FREETYPE)/include",..\include"
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;FTGL_LIBRARY_STATIC"
StringPooling="true"
RuntimeLibrary="2"
diff --git a/msvc/vc8/ftgl_demo_2.vcproj b/msvc/vc8/ftgl_demo_2.vcproj
index 0614559..febe3f2 100644
--- a/msvc/vc8/ftgl_demo_2.vcproj
+++ b/msvc/vc8/ftgl_demo_2.vcproj
@@ -4,6 +4,7 @@
Version="8.00"
Name="ftgl_demo_2"
ProjectGUID="{86573B15-D546-4A91-8055-1215F671C474}"
+ RootNamespace="ftgl_demo_2"
>
<Platforms>
<Platform
@@ -44,7 +45,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../;../../src;../../demo"
+ AdditionalIncludeDirectories="../;../../src;../../demo;"$(FREETYPE)/include""
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;FTGL_LIBRARY_STATIC"
StringPooling="true"
RuntimeLibrary="2"
@@ -135,7 +136,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../;../../src;../../demo"
+ AdditionalIncludeDirectories="../;../../src;../../demo;"$(FREETYPE)/include""
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;FTGL_LIBRARY_STATIC"
MinimalRebuild="true"
BasicRuntimeChecks="3"