Commit 8925009f79bd047054b05de9c5fba1d9dbb739b5
2000-09-26T13:25:15
Adding missing code for flat compiling mode.
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
diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
index eb03339..69e16fc 100644
--- a/src/psaux/t1decode.c
+++ b/src/psaux/t1decode.c
@@ -16,14 +16,25 @@
/***************************************************************************/
-#include <psaux/t1decode.h>
-#include <psaux/psobjs.h>
#include <freetype/internal/ftdebug.h> /* for FT_ERROR() */
#include <freetype/internal/t1errors.h>
#include <freetype/ftoutln.h>
#include <freetype/internal/ftdebug.h>
+#ifdef FT_FLAT_COMPILE
+
+#include "t1decode.h"
+#include "psobjs.h"
+
+#else
+
+#include <psaux/t1decode.h>
+#include <psaux/psobjs.h>
+
+#endif
+
+
/*************************************************************************/
/* */
/* The macro FT_COMPONENT is used in trace mode. It is an implicit */
diff --git a/src/psnames/psnames.c b/src/psnames/psnames.c
index 0344129..cb62304 100644
--- a/src/psnames/psnames.c
+++ b/src/psnames/psnames.c
@@ -18,7 +18,16 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
+
+#ifdef FT_FLAT_COMPILE
+
+#include "psmodule.c"
+
+#else
+
#include <psnames/psmodule.c>
+#endif
+
/* END */