equal
deleted
inserted
replaced
239 ifndef FREETYPE_CONFIG |
239 ifndef FREETYPE_CONFIG |
240 $(error WITH_FREETYPE can't be used when FREETYPE_CONFIG is not set. Edit Makefile.config to correct this) |
240 $(error WITH_FREETYPE can't be used when FREETYPE_CONFIG is not set. Edit Makefile.config to correct this) |
241 endif |
241 endif |
242 endif |
242 endif |
243 |
243 |
|
244 ifdef WITH_FONTCONFIG |
|
245 ifndef FONTCONFIG_CONFIG |
|
246 $(error WITH_FONTCONFIG can't be used when FONTOCNFIG_CONFIG is not set. Edit Makefile.config to correct this) |
|
247 endif |
|
248 endif |
|
249 |
244 ############################################################################## |
250 ############################################################################## |
245 # |
251 # |
246 # Compiler configuration |
252 # Compiler configuration |
247 # |
253 # |
248 |
254 |
504 CDEFS += -DWITH_FREETYPE |
510 CDEFS += -DWITH_FREETYPE |
505 CCFLAGS_FREETYPE := $(shell $(FREETYPE_CONFIG) --cflags) |
511 CCFLAGS_FREETYPE := $(shell $(FREETYPE_CONFIG) --cflags) |
506 LDFLAGS_FREETYPE := $(shell $(FREETYPE_CONFIG) --libs) |
512 LDFLAGS_FREETYPE := $(shell $(FREETYPE_CONFIG) --libs) |
507 CFLAGS += $(CCFLAGS_FREETYPE) |
513 CFLAGS += $(CCFLAGS_FREETYPE) |
508 LIBS += $(LDFLAGS_FREETYPE) |
514 LIBS += $(LDFLAGS_FREETYPE) |
|
515 endif |
|
516 |
|
517 # fontconfig config |
|
518 ifdef WITH_FONTCONFIG |
|
519 CDEFS += -DWITH_FONTCONFIG |
|
520 CCFLAGS_FONTCONFIG := $(shell $(FONTCONFIG_CONFIG) --cflags) |
|
521 LDFLAGS_FONTCONFIG := $(shell $(FONTCONFIG_CONFIG) --libs) |
|
522 CFLAGS += $(CCFLAGS_FONTCONFIG) |
|
523 LIBS += $(LDFLAGS_FONTCONFIG) |
509 endif |
524 endif |
510 |
525 |
511 # iconv is enabled defaultly on OSX >= 10.3 |
526 # iconv is enabled defaultly on OSX >= 10.3 |
512 ifdef OSX |
527 ifdef OSX |
513 ifndef JAGUAR |
528 ifndef JAGUAR |