forked from minhngoc25a/freetype2
some updates. The yesterday modifications prevented the demo
programs from compiling under Unix. fixed..
This commit is contained in:
parent
9d61e46855
commit
d00a8ce6f2
|
@ -183,16 +183,15 @@ library: $(FT_LIBRARY)
|
||||||
# on all systems though..
|
# on all systems though..
|
||||||
#
|
#
|
||||||
clean_freetype_std:
|
clean_freetype_std:
|
||||||
-$(DELETE) $(subst $(SEP),$(HOSTSEP),$(OBJ_S) $(OBJ_M))
|
-$(DELETE) $(OBJ_S) $(OBJ_M)
|
||||||
|
|
||||||
distclean_freetype_std: clean_freetype_std
|
distclean_freetype_std: clean_freetype_std
|
||||||
-$(DELETE) $(subst $(SEP),$(HOSTSEP),$(FT_LIBRARY))
|
-$(DELETE) $(FT_LIBRARY)
|
||||||
-$(DELETE) *.orig *~ core *.core
|
-$(DELETE) *.orig *~ core *.core
|
||||||
|
|
||||||
# The Dos command shell does not support very long list of arguments
|
# The Dos command shell does not support very long list of arguments
|
||||||
# so we're stuck with wildcards
|
# so we're stuck with wildcards
|
||||||
#
|
#
|
||||||
#SYSOBJ_ := $(subst $(SEP),\,$(OBJ_))
|
|
||||||
|
|
||||||
clean_freetype_dos:
|
clean_freetype_dos:
|
||||||
-del $(subst $(SEP),$(HOSTSEP),$(OBJ_))*.$O 2> nul
|
-del $(subst $(SEP),$(HOSTSEP),$(OBJ_))*.$O 2> nul
|
||||||
|
@ -201,7 +200,7 @@ distclean_freetype_dos: clean_freetype_dos
|
||||||
-del $(subst $(SEP),$(HOSTSEP),$(FT_LIBRARY)) 2> nul
|
-del $(subst $(SEP),$(HOSTSEP),$(FT_LIBRARY)) 2> nul
|
||||||
|
|
||||||
remove_config_mk:
|
remove_config_mk:
|
||||||
-$(DELETE) $(subst $(SEP),$(HOSTSEP),$(CONFIG_MK)) 2> nul
|
-$(DELETE) $(subst $(SEP),$(HOSTSEP),$(CONFIG_MK))
|
||||||
|
|
||||||
# the "config.mk" must define 'clean_freetype' and 'distclean_freetype'
|
# the "config.mk" must define 'clean_freetype' and 'distclean_freetype'
|
||||||
# implementations may use to relay these to either the 'std' or 'dos'
|
# implementations may use to relay these to either the 'std' or 'dos'
|
||||||
|
|
|
@ -178,7 +178,7 @@ ifdef BUILD_FREETYPE
|
||||||
include $(TOP)/config/freetype.mk
|
include $(TOP)/config/freetype.mk
|
||||||
|
|
||||||
clean_freetype: clean_freetype_std
|
clean_freetype: clean_freetype_std
|
||||||
distclean_freetype: clean_freetype_library_std
|
distclean_freetype: distclean_freetype_std
|
||||||
|
|
||||||
# This final rule is used to link all object files into a single
|
# This final rule is used to link all object files into a single
|
||||||
# library. It is part of the system-specific sub-Makefile because not
|
# library. It is part of the system-specific sub-Makefile because not
|
||||||
|
|
|
@ -54,17 +54,38 @@ include $(CONFIG_MK)
|
||||||
# Define a few important variables now
|
# Define a few important variables now
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
TOP_ := $(TOP)$(SEP)
|
TOP_ := $(TOP)$(SEP)
|
||||||
SRC_ := $(TOP)$(SEP)src$(SEP)
|
TOP2_ := $(TOP2)$(SEP)
|
||||||
|
SRC_ := $(TOP)$(SEP)src$(SEP)
|
||||||
|
|
||||||
BIN_ := bin$(SEP)
|
BIN_ := bin$(SEP)
|
||||||
OBJ_ := obj$(SEP)
|
OBJ_ := obj$(SEP)
|
||||||
|
|
||||||
GRAPH_DIR := graph
|
GRAPH_DIR := graph
|
||||||
|
|
||||||
|
ifeq ($(TOP),..)
|
||||||
SRC_DIR := src
|
SRC_DIR := src
|
||||||
|
else
|
||||||
|
SRC_DIR := $(TOP2_)src
|
||||||
|
endif
|
||||||
|
|
||||||
SRC_DIR_ := $(SRC_DIR)$(SEP)
|
SRC_DIR_ := $(SRC_DIR)$(SEP)
|
||||||
|
|
||||||
|
FT_INCLUDES := $(BUILD) $(TOP_)include $(SRC_)base $(SRC_DIR)
|
||||||
|
TT_INCLUDES := $(SRC_)shared $(SRC_)truetype
|
||||||
|
T1_INCLUDES := $(SRC_)shared $(SRC_)type1
|
||||||
|
|
||||||
|
COMPILE = $(CC) $(CFLAGS) $(INCLUDES:%=$I%)
|
||||||
|
LINK := $(CC)
|
||||||
|
FTLIB := $(TOP_)$(LIB_DIR)$(SEP)$(LIBRARY).$A
|
||||||
|
|
||||||
|
# the default commands used to link the executables. These can
|
||||||
|
# be re-defined for platform-specific stuff..
|
||||||
|
#
|
||||||
|
LINK = $(CC) $T$@ $< $(FTLIB) $(EFENCE)
|
||||||
|
COMMON_LINK = $(LINK) $(COMMON_OBJ)
|
||||||
|
GRAPH_LINK = $(COMMON_LINK) $(GRAPH_LIB)
|
||||||
|
|
||||||
|
|
||||||
.PHONY: exes clean distclean
|
.PHONY: exes clean distclean
|
||||||
|
|
||||||
|
@ -116,35 +137,6 @@ endif
|
||||||
clean: clean_demo
|
clean: clean_demo
|
||||||
distclean: distclean_demo
|
distclean: distclean_demo
|
||||||
|
|
||||||
####################################################################
|
|
||||||
#
|
|
||||||
# Define a few important variables now
|
|
||||||
#
|
|
||||||
#
|
|
||||||
TOP_ := $(TOP)$(SEP)
|
|
||||||
TOP2_ := $(TOP2)$(SEP)
|
|
||||||
SRC_ := $(TOP)$(SEP)src$(SEP)
|
|
||||||
|
|
||||||
BIN_ := bin$(SEP)
|
|
||||||
OBJ_ := obj$(SEP)
|
|
||||||
|
|
||||||
GRAPH_DIR := $(TOP2_)graph
|
|
||||||
|
|
||||||
SRC_DIR := $(TOP2_)src
|
|
||||||
SRC_DIR_ := $(SRC_DIR)$(SEP)
|
|
||||||
|
|
||||||
|
|
||||||
FT_INCLUDES := $(BUILD) $(TOP_)include $(SRC_)base $(SRC_DIR)
|
|
||||||
TT_INCLUDES := $(SRC_)shared $(SRC_)truetype
|
|
||||||
T1_INCLUDES := $(SRC_)shared $(SRC_)type1
|
|
||||||
|
|
||||||
COMPILE = $(CC) $(CFLAGS) $(INCLUDES:%=$I%)
|
|
||||||
LINK := $(CC)
|
|
||||||
FTLIB := $(TOP_)$(LIB_DIR)$(SEP)$(LIBRARY).$A
|
|
||||||
|
|
||||||
LINK = $(CC) $(LINKT)$@ $< $(FTLIB) $(EFENCE)
|
|
||||||
COMMON_LINK = $(COMMON_OBJ)
|
|
||||||
|
|
||||||
####################################################################
|
####################################################################
|
||||||
#
|
#
|
||||||
# Compute the executable suffix to use, and put it in `E'.
|
# Compute the executable suffix to use, and put it in `E'.
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
|
|
||||||
GRAPH_INCLUDES := $(TOP2_)graph
|
GRAPH_INCLUDES := $(TOP2_)graph
|
||||||
GRAPH_LIB := $(OBJ_)graph.$A
|
GRAPH_LIB := $(OBJ_)graph.$A
|
||||||
GRAPH_LINK := $(GRAPH_LIB)
|
#GRAPH_LINK := $(GRAPH_LIB)
|
||||||
|
|
||||||
GRAPH_ := $(TOP2_)graph$(SEP)
|
GRAPH_ := $(TOP2_)graph$(SEP)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue