[Git][freetype/freetype-demos][master] * Makefile: Reduce FT2_BUILD_FREETYPE usage

[Alexei Podtelezhnikov (@apodtele)]

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType Demo Programs

Commits:

• 354ffad2
  by Alexei Podtelezhnikov at 2021-10-25T23:00:29-04:00

  * Makefile: Reduce FT2_BUILD_FREETYPE usage
  
  Public macro FT_FACE_DRIVER_NAME utilized in d01c79af9838 makes
  FT2_BUILD_LIBRARY unnecassary in most cases.
  
  * src/ftinspect/ftinspect.pro: Ditto.
  

2 changed files:

• Makefile
• src/ftinspect/ftinspect.pro

Changes:

Makefile

---

...	...	@@ -364,6 +364,9 @@ else
364	364	FTCOMMON_OBJ := $(OBJ_DIR_2)/ftcommon.$(SO) \
365	365	$(OBJ_DIR_2)/ftpngout.$(SO)
366	366
	367	+ $(OBJ_DIR_2)/ftdump.$(SO): $(SRC_DIR)/ftdump.c
	368	+ $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
	369	+
367	370	$(OBJ_DIR_2)/ftlint.$(SO): $(SRC_DIR)/ftlint.c
368	371	$(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
369	372
...	...	@@ -404,91 +407,49 @@ else
404	407	$(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
405	408	$T$(subst /,$(COMPILER_SEP),$@ $<)
406	409
407		- $(OBJ_DIR_2)/ftmulti.$(SO): $(SRC_DIR)/ftmulti.c \
408		- $(GRAPH_LIB)
409		- $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
410		- $T$(subst /,$(COMPILER_SEP),$@ $<)
411		-
412	410	$(OBJ_DIR_2)/ftstring.$(SO): $(SRC_DIR)/ftstring.c \
413	411	$(SRC_DIR)/ftcommon.h \
414	412	$(GRAPH_LIB)
415	413	$(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
416	414	$T$(subst /,$(COMPILER_SEP),$@ $<)
417	415
418		-
419		- ####################################################################
420		- #
421		- # Special rule to compile the `ftdump' program as it includes
422		- # internal header files.
423		- #
424		- $(OBJ_DIR_2)/ftdump.$(SO): $(SRC_DIR)/ftdump.c
425		- $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<) $DFT2_BUILD_LIBRARY
426		-
427		-
428		- ####################################################################
429		- #
430		- # Special rule to compile the `t1dump' program as it includes
431		- # the Type1 source path.
432		- #
433		- $(OBJ_DIR_2)/t1dump.$(SO): $(SRC_DIR)/t1dump.c
434		- $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
435		-
436		-
437		- ####################################################################
438		- #
439		- # Special rule to compile the `ftvalid' program as it includes
440		- # internal header files.
441		- #
442		- $(OBJ_DIR_2)/ftvalid.$(SO): $(SRC_DIR)/ftvalid.c
443		- $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<) $DFT2_BUILD_LIBRARY
444		-
445		-
446		- ####################################################################
447		- #
448		- # Special rule to compile the `ftview' program as it includes
449		- # internal header files.
450		- #
451	416	$(OBJ_DIR_2)/ftview.$(SO): $(SRC_DIR)/ftview.c \
452	417	$(SRC_DIR)/ftcommon.h \
453	418	$(GRAPH_LIB)
454	419	$(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
455		- $T$(subst /,$(COMPILER_SEP),$@ $<) $DFT2_BUILD_LIBRARY
456		-
	420	+ $T$(subst /,$(COMPILER_SEP),$@ $<)
457	421
458		- ####################################################################
459		- #
460		- # Special rule to compile the `ftsdf' program as it includes
461		- # internal header files.
462		- #
463	422	$(OBJ_DIR_2)/ftsdf.$(SO): $(SRC_DIR)/ftsdf.c \
464	423	$(SRC_DIR)/ftcommon.h \
465	424	$(GRAPH_LIB)
466	425	$(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
467		- $T$(subst /,$(COMPILER_SEP),$@ $<) $DFT2_BUILD_LIBRARY
468		-
	426	+ $T$(subst /,$(COMPILER_SEP),$@ $<)
469	427
470		- ####################################################################
471		- #
472		- # Special rule to compile the `ftdiff' program as it includes
473		- # internal header files.
474		- #
475	428	$(OBJ_DIR_2)/ftdiff.$(SO): $(SRC_DIR)/ftdiff.c \
476	429	$(SRC_DIR)/ftcommon.h \
477	430	$(GRAPH_LIB)
478	431	$(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
479		- $T$(subst /,$(COMPILER_SEP),$@ $<) $DFT2_BUILD_LIBRARY
	432	+ $T$(subst /,$(COMPILER_SEP),$@ $<)
	433	+
	434	+ $(OBJ_DIR_2)/ftgrid.$(SO): $(SRC_DIR)/ftgrid.c \
	435	+ $(SRC_DIR)/ftcommon.h \
	436	+ $(GRAPH_LIB)
	437	+ $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
	438	+ $T$(subst /,$(COMPILER_SEP),$@ $<)
	439	+
	440	+ $(OBJ_DIR_2)/ftmulti.$(SO): $(SRC_DIR)/ftmulti.c \
	441	+ $(GRAPH_LIB)
	442	+ $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
	443	+ $T$(subst /,$(COMPILER_SEP),$@ $<)
480	444
481	445
482	446	####################################################################
483	447	#
484		- # Special rule to compile the `ftgrid' program as it includes
	448	+ # Special rule to compile the `ftvalid' program as it includes
485	449	# internal header files.
486	450	#
487		- $(OBJ_DIR_2)/ftgrid.$(SO): $(SRC_DIR)/ftgrid.c \
488		- $(SRC_DIR)/ftcommon.h \
489		- $(GRAPH_LIB)
490		- $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
491		- $T$(subst /,$(COMPILER_SEP),$@ $<) $DFT2_BUILD_LIBRARY
	451	+ $(OBJ_DIR_2)/ftvalid.$(SO): $(SRC_DIR)/ftvalid.c
	452	+ $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<) $DFT2_BUILD_LIBRARY
492	453
493	454
494	455	####################################################################

src/ftinspect/ftinspect.pro

---

...	...	@@ -19,9 +19,6 @@ win32 {
19	19
20	20	CONFIG += qt debug
21	21
22		-# we need access to internal FreeType header files
23		-DEFINES += FT2_BUILD_LIBRARY
24		-
25	22	SOURCES += \
26	23	engine/engine.cpp \
27	24	rendering/glyphbitmap.cpp \

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings.