Werner Lemberg pushed to branch master at FreeType / FreeType Demo Programs
Commits:
-
8e9447b3
by orbea at 2021-03-24T07:34:14+01:00
2 changed files:
Changes:
| 1 |
+2021-03-24 orbea <orbea@riseup.net>
|
|
| 2 |
+ |
|
| 3 |
+ [graph] Fix build with `slibtool`.
|
|
| 4 |
+ |
|
| 5 |
+ * graph/rules.mk (GRAPH_LIB): Handle the case specially where
|
|
| 6 |
+ `LIBTOOL` is defined.
|
|
| 7 |
+ (COMPILE_GRAPH_LIB) <LIBTOOL>: Enable use of `dlopen`.
|
|
| 8 |
+ |
|
| 1 | 9 |
2021-03-18 Alexei Podtelezhnikov <apodtele@gmail.com>
|
| 2 | 10 |
|
| 3 | 11 |
[ftbench] Add Windows performance timers.
|
| ... | ... | @@ -12,7 +12,6 @@ |
| 12 | 12 |
|
| 13 | 13 |
|
| 14 | 14 |
GRAPH_INCLUDES := $(subst /,$(COMPILER_SEP),$(TOP_DIR_2)/graph)
|
| 15 |
-GRAPH_LIB := $(OBJ_DIR_2)/graph.$(SA)
|
|
| 16 | 15 |
|
| 17 | 16 |
GRAPH := $(TOP_DIR_2)/graph
|
| 18 | 17 |
|
| ... | ... | @@ -46,9 +45,11 @@ GRAPH_OBJS := $(OBJ_DIR_2)/gblblit.$(O) \ |
| 46 | 45 |
# this value can be modified by the system-specific graphics drivers.
|
| 47 | 46 |
#
|
| 48 | 47 |
ifneq ($(LIBTOOL),)
|
| 49 |
- COMPILE_GRAPH_LIB = $(LIBTOOL) --mode=link $(CCraw) -static \
|
|
| 48 |
+ GRAPH_LIB := $(OBJ_DIR_2)/graph.$(A)
|
|
| 49 |
+ COMPILE_GRAPH_LIB = $(LIBTOOL) --mode=link $(CCraw) -module -static \
|
|
| 50 | 50 |
-o $(subst /,$(COMPILER_SEP),$@ $(GRAPH_OBJS))
|
| 51 | 51 |
else
|
| 52 |
+ GRAPH_LIB := $(OBJ_DIR_2)/graph.$(SA)
|
|
| 52 | 53 |
COMPILE_GRAPH_LIB = ar -r $(subst /,$(COMPILER_SEP),$@ $(GRAPH_OBJS))
|
| 53 | 54 |
endif
|
| 54 | 55 |
|