freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Git][freetype/freetype][GSoC-2023-Ahmet] compiling and linking works as


From: @goksu
Subject: [Git][freetype/freetype][GSoC-2023-Ahmet] compiling and linking works as demos
Date: Thu, 20 Jul 2023 11:52:12 +0000

Ahmet Göksu pushed to branch GSoC-2023-Ahmet at FreeType / FreeType

Commits:

  • 1fb442f6
    by goksu at 2023-07-20T14:51:58+03:00
    compiling and linking works as demos
    

1 changed file:

Changes:

  • builds/testing.mk
    ... ... @@ -3,8 +3,8 @@ FTBENCH_DIR = $(TOP_DIR)/src/tools/ftbench
    3 3
     FTBENCH_SRC = $(FTBENCH_DIR)/ftbench.c
    
    4 4
     FTBENCH_OBJ = $(OBJ_DIR)/bench.$(SO)
    
    5 5
     FTBENCH_BIN = $(OBJ_DIR)/bench
    
    6
    -FTBENCH_FLAG ?= -c 200
    
    7
    -INCLUDES = -I$(TOP_DIR)/include
    
    6
    +FTBENCH_FLAG ?= -c 2000
    
    7
    +INCLUDES = $(TOP_DIR)/include
    
    8 8
     FONTS = $(wildcard $(FTBENCH_DIR)/fonts/*.ttf)
    
    9 9
     BASELINE_DIR = $(OBJ_DIR)/baseline/
    
    10 10
     BENCHMARK_DIR = $(OBJ_DIR)/benchmark/
    
    ... ... @@ -15,19 +15,40 @@ BENCHMARK_INFO = $(BENCHMARK_DIR)info.txt
    15 15
     HTMLCREATOR = $(FTBENCH_DIR)/src/tohtml.py
    
    16 16
     HTMLFILE = $(OBJ_DIR)/benchmark.html
    
    17 17
     
    
    18
    +FT_INCLUDES := $(OBJ_BUILD) \
    
    19
    +                 $(INCLUDES) 
    
    20
    +
    
    21
    +COMPILE = $(CC) $(ANSIFLAGS) \
    
    22
    +                  $(INCLUDES:%=$I%) \
    
    23
    +                  $(CFLAGS)
    
    24
    +
    
    25
    +ifneq ($(findstring -pedantic,$(COMPILE)),)
    
    26
    +    ifeq ($(findstring ++,$(CC)),)
    
    27
    +      COMPILE += -std=c99
    
    28
    +    endif
    
    29
    +endif
    
    30
    +
    
    31
    +FTLIB := $(LIB_DIR)/$(LIBRARY).$A
    
    32
    +
    
    33
    +override CC = $(CCraw)
    
    34
    +LINK_CMD    = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
    
    35
    +
    
    36
    +EXTRAFLAGS = $DUNIX $DHAVE_POSIX_TERMIOS
    
    37
    +
    
    38
    +INCLUDES := $(subst /,$(COMPILER_SEP),$(FT_INCLUDES))
    
    39
    +
    
    18 40
     # Create directories for baseline and benchmark
    
    19 41
     $(OBJ_DIR) $(BASELINE_DIR) $(BENCHMARK_DIR):
    
    20 42
     	@mkdir -p $@
    
    21 43
     
    
    22
    -# Build ftbench.o
    
    23
    -$(FTBENCH_OBJ): $(FTBENCH_SRC)
    
    24
    -	@echo "Building ftbench object..."
    
    25
    -	$(CC) $(INCLUDES) -c $< -o $@
    
    26
    -	
    
    44
    +$(FTBENCH_OBJ): $(FTBENCH_SRC) 
    
    45
    +	  $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<) $(EXTRAFLAGS)
    
    46
    +	  @echo "Object created."
    
    47
    +
    
    27 48
     # Build ftbench
    
    28
    -$(FTBENCH_BIN): $(FTBENCH_OBJ)
    
    49
    +$(FTBENCH_BIN): $(FTBENCH_OBJ) 
    
    29 50
     	@echo "Linking ftbench..."
    
    30
    -	$(LIBTOOL) --mode=link gcc -L$(LIB_DIR) -lfreetype $< -o $@
    
    51
    +	$(LINK_CMD) $T$(subst /,$(COMPILER_SEP),$@ $<) $(FTLIB)
    
    31 52
     	@echo "Built."
    
    32 53
     
    
    33 54
     # Create a baseline
    
    ... ... @@ -76,4 +97,5 @@ clean-benchmark:
    76 97
     	@echo "Cleaning..."
    
    77 98
     	@$(RM) $(FTBENCH_BIN) $(FTBENCH_OBJ)
    
    78 99
     	@$(RM) -rf $(BASELINE_DIR) $(BENCHMARK_DIR) $(HTMLFILE)
    
    79
    -	@echo "Cleaned."
    100
    +	@echo "Cleaned"
    
    101
    +


  • reply via email to

    [Prev in Thread] Current Thread [Next in Thread]