Commit 9f60f535d39df5cdd687c6b4773cd903f6f379ca
2001-10-10T21:59:02
Added FTGL_EXPORT to class declarations for the windows port
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 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446
diff --git a/include/FTBitmapGlyph.h b/include/FTBitmapGlyph.h
index d650ba5..35d129e 100755
--- a/include/FTBitmapGlyph.h
+++ b/include/FTBitmapGlyph.h
@@ -1,6 +1,8 @@
#ifndef __FTBitmapGlyph__
#define __FTBitmapGlyph__
+#include "FTGL.h"
+
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_GLYPH_H
@@ -8,7 +10,7 @@
#include "FTGlyph.h"
-class FTBitmapGlyph : public FTGlyph
+class FTGL_EXPORT FTBitmapGlyph : public FTGlyph
{
public:
/**
@@ -46,3 +48,4 @@ class FTBitmapGlyph : public FTGlyph
#endif // __FTBitmapGlyph__
+
diff --git a/include/FTFace.h b/include/FTFace.h
index 9ba7514..2f3fecc 100755
--- a/include/FTFace.h
+++ b/include/FTFace.h
@@ -1,7 +1,7 @@
#ifndef __FTFace__
#define __FTFace__
-//#include "FTGL.h"
+#include "FTGL.h"
#include <ft2build.h>
#include FT_FREETYPE_H
@@ -17,7 +17,7 @@ class FTCharmap;
* @see "Freetype 2 Documentation - 2.0.4"
*
*/
-class FTFace
+class FTGL_EXPORT FTFace
{
public:
/**
diff --git a/include/FTFont.h b/include/FTFont.h
index 70650c2..59bfd2f 100755
--- a/include/FTFont.h
+++ b/include/FTFont.h
@@ -3,6 +3,8 @@
#include <string>
+#include "FTGL.h"
+
#include <ft2build.h>
#include FT_FREETYPE_H
@@ -30,7 +32,7 @@ using namespace std;
* @see FTGlyphContainer
* @see FTGlyph
*/
-class FTFont
+class FTGL_EXPORT FTFont
{
public:
/**
@@ -177,3 +179,4 @@ class FTFont
#endif // __FTFont__
+
diff --git a/include/FTGLBitmapFont.h b/include/FTGLBitmapFont.h
index cf827af..fdf5612 100755
--- a/include/FTGLBitmapFont.h
+++ b/include/FTGLBitmapFont.h
@@ -2,7 +2,9 @@
#define __FTGLBitmapFont__
-#include "FTFont.h"
+#include "FTGL.h"
+
+#include "FTFont.h"
class FTBitmapGlyph;
@@ -12,7 +14,7 @@ class FTBitmapGlyph;
*
* @see FTFont
*/
-class FTGLBitmapFont : public FTFont
+class FTGL_EXPORT FTGLBitmapFont : public FTFont
{
public:
/**
diff --git a/include/FTGLOutlineFont.h b/include/FTGLOutlineFont.h
index 172100a..97597c3 100755
--- a/include/FTGLOutlineFont.h
+++ b/include/FTGLOutlineFont.h
@@ -1,10 +1,10 @@
-#ifndef __FTGLOutlineFont
-#define __FTGLOutlineFont
+#ifndef __FTGLOutlineFont__
+#define __FTGLOutlineFont__
-
-#include "FTFont.h"
#include "FTGL.h"
+#include "FTFont.h"
+
class FTOutlineGlyph;
@@ -14,7 +14,7 @@ class FTOutlineGlyph;
*
* @see FTFont
*/
-class FTGLOutlineFont : public FTFont
+class FTGL_EXPORT FTGLOutlineFont : public FTFont
{
public:
// methods
@@ -34,4 +34,4 @@ class FTGLOutlineFont : public FTFont
FTOutlineGlyph* tempGlyph;
};
-#endif
+#endif // __FTGLOutlineFont__
diff --git a/include/FTGLPixmapFont.h b/include/FTGLPixmapFont.h
index d0422bd..88eb8e8 100755
--- a/include/FTGLPixmapFont.h
+++ b/include/FTGLPixmapFont.h
@@ -2,7 +2,9 @@
#define __FTGLPixmapFont__
-#include "FTFont.h"
+#include "FTGL.h"
+
+#include "FTFont.h"
class FTPixmapGlyph;
@@ -12,7 +14,7 @@ class FTPixmapGlyph;
*
* @see FTFont
*/
-class FTGLPixmapFont : public FTFont
+class FTGL_EXPORT FTGLPixmapFont : public FTFont
{
public:
// methods
@@ -34,3 +36,4 @@ class FTGLPixmapFont : public FTFont
#endif // __FTGLPixmapFont__
+
diff --git a/include/FTGLPolygonFont.h b/include/FTGLPolygonFont.h
index 27c41ce..720977b 100755
--- a/include/FTGLPolygonFont.h
+++ b/include/FTGLPolygonFont.h
@@ -1,10 +1,10 @@
#ifndef __FTGLPolygonFont__
#define __FTGLPolygonFont__
-#include "FTFont.h"
-
#include "FTGL.h"
+#include "FTFont.h"
+
class FTPolyGlyph;
@@ -14,7 +14,7 @@ class FTPolyGlyph;
*
* @see FTFont
*/
-class FTGLPolygonFont : public FTFont
+class FTGL_EXPORT FTGLPolygonFont : public FTFont
{
public:
// methods
@@ -32,4 +32,7 @@ class FTGLPolygonFont : public FTFont
};
+
+
#endif // __FTGLPolygonFont__
+
diff --git a/include/FTGLTextureFont.h b/include/FTGLTextureFont.h
index 81e296b..1a8e89d 100755
--- a/include/FTGLTextureFont.h
+++ b/include/FTGLTextureFont.h
@@ -1,8 +1,8 @@
-#ifndef __FTGLTextureFont
-#define __FTGLTextureFont
-#include "FTFont.h"
+#ifndef __FTGLTextureFont__
+#define __FTGLTextureFont__
#include "FTGL.h"
+#include "FTFont.h"
class FTTextureGlyph;
@@ -12,7 +12,7 @@ class FTTextureGlyph;
*
* @see FTFont
*/
-class FTGLTextureFont : public FTFont
+class FTGL_EXPORT FTGLTextureFont : public FTFont
{
public:
// methods
@@ -51,4 +51,8 @@ class FTGLTextureFont : public FTFont
};
-#endif
+
+
+#endif // __FTGLTextureFont__
+
+
diff --git a/include/FTGlyph.h b/include/FTGlyph.h
index 5002d06..61a41ac 100755
--- a/include/FTGlyph.h
+++ b/include/FTGlyph.h
@@ -1,6 +1,8 @@
#ifndef __FTGlyph__
#define __FTGlyph__
+#include "FTGL.h"
+
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_GLYPH_H
@@ -17,7 +19,7 @@
* @see FTGlyphContainer
*
*/
-class FTGlyph
+class FTGL_EXPORT FTGlyph
{
public:
/**
@@ -74,3 +76,4 @@ class FTGlyph
#endif // __FTGlyph__
+
diff --git a/include/FTGlyphContainer.h b/include/FTGlyphContainer.h
index c2d3a93..f12bb6f 100755
--- a/include/FTGlyphContainer.h
+++ b/include/FTGlyphContainer.h
@@ -1,6 +1,8 @@
#ifndef __FTGlyphContainer__
#define __FTGlyphContainer__
+#include "FTGL.h"
+
#include <vector>
#include <ft2build.h>
@@ -18,7 +20,7 @@ using namespace std;
*
* @see FTGlyph
*/
-class FTGlyphContainer
+class FTGL_EXPORT FTGlyphContainer
{
public:
/**
diff --git a/include/FTLibrary.h b/include/FTLibrary.h
index ce922b9..725ffc8 100755
--- a/include/FTLibrary.h
+++ b/include/FTLibrary.h
@@ -1,13 +1,12 @@
#ifndef __FTLibrary__
#define __FTLibrary__
+#include "FTGL.h"
#include <ft2build.h>
#include FT_FREETYPE_H
//#include FT_CACHE_H
-#include "FTGL.h"
-
/**
* FTLibrary class is the global accessor for the Freetype library.
@@ -27,7 +26,7 @@
* @see "Freetype 2 Documentation - 2.0.4"
*
*/
-class FTLibrary
+class FTGL_EXPORT FTLibrary
{
public:
// methods
@@ -71,7 +70,7 @@ class FTLibrary
*/
FTLibrary();
FTLibrary( const FT_Library&){}
- FTLibrary& operator=( const FT_Library&){}
+ FTLibrary& operator=( const FT_Library&) { return *this; }
/**
* Initialises the Freetype library
diff --git a/include/FTOutlineGlyph.h b/include/FTOutlineGlyph.h
index eb2dd37..ee230a2 100644
--- a/include/FTOutlineGlyph.h
+++ b/include/FTOutlineGlyph.h
@@ -1,6 +1,8 @@
#ifndef __FTOutlineGlyph__
#define __FTOutlineGlyph__
+#include "FTGL.h"
+
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_GLYPH_H
@@ -9,7 +11,7 @@
class FTVectoriser;
-class FTOutlineGlyph : public FTGlyph
+class FTGL_EXPORT FTOutlineGlyph : public FTGlyph
{
public:
// methods
@@ -34,3 +36,4 @@ class FTOutlineGlyph : public FTGlyph
#endif // __FTOutlineGlyph__
+
diff --git a/include/FTPixmapGlyph.h b/include/FTPixmapGlyph.h
index 3485e8d..ece06ba 100755
--- a/include/FTPixmapGlyph.h
+++ b/include/FTPixmapGlyph.h
@@ -1,6 +1,8 @@
#ifndef __FTPixmapGlyph__
#define __FTPixmapGlyph__
+#include "FTGL.h"
+
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_GLYPH_H
@@ -8,7 +10,7 @@
#include "FTGlyph.h"
-class FTPixmapGlyph : public FTGlyph
+class FTGL_EXPORT FTPixmapGlyph : public FTGlyph
{
public:
// methods
diff --git a/include/FTPolyGlyph.h b/include/FTPolyGlyph.h
index 7682fcd..cca5046 100644
--- a/include/FTPolyGlyph.h
+++ b/include/FTPolyGlyph.h
@@ -1,6 +1,8 @@
#ifndef __FTPolyGlyph__
#define __FTPolyGlyph__
+#include "FTGL.h"
+
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_GLYPH_H
@@ -9,7 +11,7 @@
class FTVectoriser;
-class FTPolyGlyph : public FTGlyph
+class FTGL_EXPORT FTPolyGlyph : public FTGlyph
{
public:
// methods
@@ -36,3 +38,4 @@ class FTPolyGlyph : public FTGlyph
#endif // __FTPolyGlyph__
+
diff --git a/include/FTSize.h b/include/FTSize.h
index 774c8d9..e586092 100755
--- a/include/FTSize.h
+++ b/include/FTSize.h
@@ -1,10 +1,11 @@
#ifndef __FTSize__
#define __FTSize__
+#include "FTGL.h"
+
#include <ft2build.h>
#include FT_FREETYPE_H
-#include "FTGL.h"
/**
@@ -13,7 +14,7 @@
* @see "Freetype 2 Documentation - 2.0.4"
*
*/
-class FTSize
+class FTGL_EXPORT FTSize
{
public:
/**
@@ -116,3 +117,4 @@ class FTSize
};
#endif // __FTSize__
+
diff --git a/include/FTTextureGlyph.h b/include/FTTextureGlyph.h
index bac8d4c..6f2aad4 100755
--- a/include/FTTextureGlyph.h
+++ b/include/FTTextureGlyph.h
@@ -1,6 +1,7 @@
#ifndef __FTTextureGlyph__
#define __FTTextureGlyph__
+#include "FTGL.h"
#include <ft2build.h>
#include FT_FREETYPE_H
@@ -9,7 +10,7 @@
#include "FTGlyph.h"
-class FTTextureGlyph : public FTGlyph
+class FTGL_EXPORT FTTextureGlyph : public FTGlyph
{
public:
// methods