ttdebug will compile again...
This commit is contained in:
parent
7fa51b5535
commit
50857ff4b3
|
@ -71,9 +71,7 @@ else
|
||||||
|
|
||||||
SRC_DIR_ := $(SRC_DIR)$(SEP)
|
SRC_DIR_ := $(SRC_DIR)$(SEP)
|
||||||
|
|
||||||
FT_INCLUDES := $(BUILD) $(TOP_)config $(TOP_)include $(SRC_)base $(SRC_DIR)
|
FT_INCLUDES := $(BUILD) $(TOP_)config $(TOP_)include $(SRC_) $(SRC_DIR)
|
||||||
TT_INCLUDES := $(SRC_)shared $(SRC_)truetype
|
|
||||||
T1_INCLUDES := $(SRC_)shared $(SRC_)type1
|
|
||||||
|
|
||||||
COMPILE = $(CC) $(CFLAGS) $(INCLUDES:%=$I%)
|
COMPILE = $(CC) $(CFLAGS) $(INCLUDES:%=$I%)
|
||||||
FTLIB := $(TOP_)$(LIB_DIR)$(SEP)$(LIBRARY).$A
|
FTLIB := $(TOP_)$(LIB_DIR)$(SEP)$(LIBRARY).$A
|
||||||
|
@ -225,7 +223,7 @@ else
|
||||||
# the Type1 source path
|
# the Type1 source path
|
||||||
#
|
#
|
||||||
$(OBJ_)t1dump.$O: $(SRC_DIR)/t1dump.c
|
$(OBJ_)t1dump.$O: $(SRC_DIR)/t1dump.c
|
||||||
$(COMPILE) $(T1_INCLUDES:%=$I%) $T$@ $<
|
$(COMPILE) $T$@ $<
|
||||||
|
|
||||||
|
|
||||||
####################################################################
|
####################################################################
|
||||||
|
@ -242,7 +240,7 @@ else
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(OBJ_)ttdebug.$O: $(SRC_DIR)/ttdebug.c
|
$(OBJ_)ttdebug.$O: $(SRC_DIR)/ttdebug.c
|
||||||
$(COMPILE) $(TT_INCLUDES:%=$I%) $T$@ $< $(EXTRAFLAGS)
|
$(COMPILE) $T$@ $< $(EXTRAFLAGS)
|
||||||
|
|
||||||
|
|
||||||
####################################################################
|
####################################################################
|
||||||
|
|
|
@ -27,9 +27,9 @@
|
||||||
|
|
||||||
|
|
||||||
#include <freetype/freetype.h>
|
#include <freetype/freetype.h>
|
||||||
#include "ttobjs.h"
|
#include <truetype/ttobjs.h>
|
||||||
#include "ttdriver.h"
|
#include <truetype/ttdriver.h>
|
||||||
#include "ttinterp.h"
|
#include <truetype/ttinterp.h>
|
||||||
|
|
||||||
|
|
||||||
FT_Library library; /* root library object */
|
FT_Library library; /* root library object */
|
||||||
|
|
Loading…
Reference in New Issue