diff options
Diffstat (limited to 'src/winfonts/rules.mk')
| -rw-r--r-- | src/winfonts/rules.mk | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/winfonts/rules.mk b/src/winfonts/rules.mk index 994eef833..71a7df2d8 100644 --- a/src/winfonts/rules.mk +++ b/src/winfonts/rules.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2001 by +# Copyright 1996-2000, 2001, 2003 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -15,21 +15,20 @@ # Windows driver directory # -FNT_DIR := $(SRC_)winfonts -FNT_DIR_ := $(FNT_DIR)$(SEP) +FNT_DIR := $(SRC_DIR)/winfonts -FNT_COMPILE := $(FT_COMPILE) $I$(FNT_DIR) +FNT_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(FNT_DIR)) # Windows driver sources (i.e., C files) # -FNT_DRV_SRC := $(FNT_DIR_)winfnt.c +FNT_DRV_SRC := $(FNT_DIR)/winfnt.c # Windows driver headers # FNT_DRV_H := $(FNT_DRV_SRC:%.c=%.h) \ - $(FNT_DIR_)fnterrs.h + $(FNT_DIR)/fnterrs.h # Windows driver object(s) @@ -37,24 +36,24 @@ FNT_DRV_H := $(FNT_DRV_SRC:%.c=%.h) \ # FNT_DRV_OBJ_M is used during `multi' builds # FNT_DRV_OBJ_S is used during `single' builds # -FNT_DRV_OBJ_M := $(FNT_DRV_SRC:$(FNT_DIR_)%.c=$(OBJ_)%.$O) -FNT_DRV_OBJ_S := $(OBJ_)winfnt.$O +FNT_DRV_OBJ_M := $(FNT_DRV_SRC:$(FNT_DIR)/%.c=$(OBJ_DIR)/%.$O) +FNT_DRV_OBJ_S := $(OBJ_DIR)/winfnt.$O # Windows driver source file for single build # -FNT_DRV_SRC_S := $(FNT_DIR_)winfnt.c +FNT_DRV_SRC_S := $(FNT_DIR)/winfnt.c # Windows driver - single object # $(FNT_DRV_OBJ_S): $(FNT_DRV_SRC_S) $(FNT_DRV_SRC) $(FREETYPE_H) $(FNT_DRV_H) - $(FNT_COMPILE) $T$@ $(FNT_DRV_SRC_S) + $(FNT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(FNT_DRV_SRC_S)) # Windows driver - multiple objects # -$(OBJ_)%.$O: $(FNT_DIR_)%.c $(FREETYPE_H) $(FNT_DRV_H) - $(FNT_COMPILE) $T$@ $< +$(OBJ_DIR)/%.$O: $(FNT_DIR)/%.c $(FREETYPE_H) $(FNT_DRV_H) + $(FNT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<) # update main driver object lists @@ -62,4 +61,5 @@ $(OBJ_)%.$O: $(FNT_DIR_)%.c $(FREETYPE_H) $(FNT_DRV_H) DRV_OBJS_S += $(FNT_DRV_OBJ_S) DRV_OBJS_M += $(FNT_DRV_OBJ_M) + # EOF |