Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType Demo Programs
Commits:
-
b328afa5
by Hugh McMaster at 2021-10-13T13:02:41+00:00
2 changed files:
Changes:
| ... | ... | @@ -36,6 +36,10 @@ WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING |
| 36 | 36 |
using pkg-config. If X11 is not found, some demo programs will
|
| 37 | 37 |
not be able to display graphics and will fail.
|
| 38 | 38 |
|
| 39 |
+ Users with X11 installed in a non-standard location can specify
|
|
| 40 |
+ the paths to the development headers and library by passing the
|
|
| 41 |
+ X11_CFLAGS and X11_LIBS variables on the command line.
|
|
| 42 |
+ |
|
| 39 | 43 |
If you don't have X11 at all, fix the definition of the `EXES`
|
| 40 | 44 |
variable as described in the top-level Makefile.
|
| 41 | 45 |
|
| ... | ... | @@ -9,14 +9,14 @@ ifeq ($(PKG_CONFIG),) |
| 9 | 9 |
PKG_CONFIG = pkg-config
|
| 10 | 10 |
endif
|
| 11 | 11 |
|
| 12 |
-X11_INCLUDE := $(shell $(PKG_CONFIG) --cflags x11)
|
|
| 13 |
-X11_LIB := $(shell $(PKG_CONFIG) --libs x11)
|
|
| 12 |
+X11_CFLAGS ?= $(shell $(PKG_CONFIG) --cflags x11)
|
|
| 13 |
+X11_LIBS ?= $(shell $(PKG_CONFIG) --libs x11)
|
|
| 14 | 14 |
|
| 15 |
-ifneq ($(X11_LIB),)
|
|
| 15 |
+ifneq ($(X11_LIBS),)
|
|
| 16 | 16 |
# The GRAPH_LINK variable is expanded each time an executable is linked
|
| 17 | 17 |
# against the graphics library.
|
| 18 | 18 |
#
|
| 19 |
- GRAPH_LINK += $(X11_LIB)
|
|
| 19 |
+ GRAPH_LINK += $(X11_LIBS)
|
|
| 20 | 20 |
|
| 21 | 21 |
# Solaris needs a -lsocket in GRAPH_LINK.
|
| 22 | 22 |
#
|
| ... | ... | @@ -41,12 +41,12 @@ ifneq ($(X11_LIB),) |
| 41 | 41 |
$(LIBTOOL) --mode=compile $(CC) -static $(CFLAGS) \
|
| 42 | 42 |
$(GRAPH_INCLUDES:%=$I%) \
|
| 43 | 43 |
$I$(subst /,$(COMPILER_SEP),$(GR_X11)) \
|
| 44 |
- $(X11_INCLUDE:%=$I%) \
|
|
| 44 |
+ $(X11_CFLAGS:%=$I%) \
|
|
| 45 | 45 |
$T$(subst /,$(COMPILER_SEP),$@ $<)
|
| 46 | 46 |
else
|
| 47 | 47 |
$(CC) $(CFLAGS) $(GRAPH_INCLUDES:%=$I%) \
|
| 48 | 48 |
$I$(subst /,$(COMPILER_SEP),$(GR_X11)) \
|
| 49 |
- $(X11_INCLUDE:%=$I%) \
|
|
| 49 |
+ $(X11_CFLAGS:%=$I%) \
|
|
| 50 | 50 |
$T$(subst /,$(COMPILER_SEP),$@ $<)
|
| 51 | 51 |
endif
|
| 52 | 52 |
endif
|