Commit 50857ff4b3a7aa47decb140ff83d9fccccbafcc3
2000-07-08T20:14:13
ttdebug will compile again...
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
diff --git a/demos/Makefile b/demos/Makefile
index a2b4d9c..17b9a0f 100644
--- a/demos/Makefile
+++ b/demos/Makefile
@@ -71,9 +71,7 @@ else
SRC_DIR_ := $(SRC_DIR)$(SEP)
- FT_INCLUDES := $(BUILD) $(TOP_)config $(TOP_)include $(SRC_)base $(SRC_DIR)
- TT_INCLUDES := $(SRC_)shared $(SRC_)truetype
- T1_INCLUDES := $(SRC_)shared $(SRC_)type1
+ FT_INCLUDES := $(BUILD) $(TOP_)config $(TOP_)include $(SRC_) $(SRC_DIR)
COMPILE = $(CC) $(CFLAGS) $(INCLUDES:%=$I%)
FTLIB := $(TOP_)$(LIB_DIR)$(SEP)$(LIBRARY).$A
@@ -225,7 +223,7 @@ else
# the Type1 source path
#
$(OBJ_)t1dump.$O: $(SRC_DIR)/t1dump.c
- $(COMPILE) $(T1_INCLUDES:%=$I%) $T$@ $<
+ $(COMPILE) $T$@ $<
####################################################################
@@ -242,7 +240,7 @@ else
endif
$(OBJ_)ttdebug.$O: $(SRC_DIR)/ttdebug.c
- $(COMPILE) $(TT_INCLUDES:%=$I%) $T$@ $< $(EXTRAFLAGS)
+ $(COMPILE) $T$@ $< $(EXTRAFLAGS)
####################################################################
diff --git a/demos/src/ttdebug.c b/demos/src/ttdebug.c
index 7126379..427eca2 100644
--- a/demos/src/ttdebug.c
+++ b/demos/src/ttdebug.c
@@ -27,9 +27,9 @@
#include <freetype/freetype.h>
-#include "ttobjs.h"
-#include "ttdriver.h"
-#include "ttinterp.h"
+#include <truetype/ttobjs.h>
+#include <truetype/ttdriver.h>
+#include <truetype/ttinterp.h>
FT_Library library; /* root library object */