Ahmet Göksu pushed to branch GSoC-2023-Ahmet at FreeType / FreeType
Commits:
-
f9775cf1
by goksu at 2023-07-24T22:24:33+03:00
1 changed file:
Changes:
... | ... | @@ -2,7 +2,7 @@ |
2 | 2 | FTBENCH_DIR = $(TOP_DIR)/src/tools/ftbench
|
3 | 3 | FTBENCH_SRC = $(FTBENCH_DIR)/ftbench.c
|
4 | 4 | FTBENCH_OBJ = $(OBJ_DIR)/bench.$(SO)
|
5 | -FTBENCH_BIN = $(OBJ_DIR)/bench
|
|
5 | +FTBENCH_BIN = $(OBJ_DIR)/bench$E
|
|
6 | 6 | FTBENCH_FLAG ?= -c 2000
|
7 | 7 | INCLUDES = $(TOP_DIR)/include
|
8 | 8 | FONTS = $(wildcard $(FTBENCH_DIR)/fonts/*.ttf)
|
... | ... | @@ -37,11 +37,9 @@ endif |
37 | 37 | FTLIB := $(LIB_DIR)/$(LIBRARY).$A
|
38 | 38 | |
39 | 39 | ifeq ($(PLATFORM),unix)
|
40 | - override CC = $(CCraw)
|
|
41 | - LINK_CMD = $(LIBTOOL) --mode=link $(CC) \
|
|
40 | + LINK_CMD = $(LIBTOOL) --mode=link $(CCraw) \
|
|
42 | 41 | $(subst /,$(COMPILER_SEP),$(LDFLAGS))
|
43 | - LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) \
|
|
44 | - $(FT_DEMO_LDFLAGS)
|
|
42 | + LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE))
|
|
45 | 43 | else
|
46 | 44 | LINK_CMD = $(CC) $(subst /,$(COMPILER_SEP),$(LDFLAGS))
|
47 | 45 | ifeq ($(PLATFORM),unixdev)
|
... | ... | @@ -55,9 +53,6 @@ else |
55 | 53 | LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE))
|
56 | 54 | endif
|
57 | 55 | endif
|
58 | -ifeq ($(OS),Windows_NT)
|
|
59 | - LINK_LIBS += -lgdiplus
|
|
60 | -endif
|
|
61 | 56 | |
62 | 57 | ifeq ($(OS),Windows_NT)
|
63 | 58 | LINK_LIBS += -lgdiplus
|