equal
deleted
inserted
replaced
511 # freetype config |
511 # freetype config |
512 ifdef WITH_FREETYPE |
512 ifdef WITH_FREETYPE |
513 CDEFS += -DWITH_FREETYPE |
513 CDEFS += -DWITH_FREETYPE |
514 CCFLAGS_FREETYPE := $(shell $(FREETYPE_CONFIG) --cflags) |
514 CCFLAGS_FREETYPE := $(shell $(FREETYPE_CONFIG) --cflags) |
515 LDFLAGS_FREETYPE := $(shell $(FREETYPE_CONFIG) --libs) |
515 LDFLAGS_FREETYPE := $(shell $(FREETYPE_CONFIG) --libs) |
|
516 |
|
517 ifdef STATIC |
|
518 ifdef OSX |
|
519 # OSX needs a special lib setting when linking statically |
|
520 LDFLAGS_FREETYPE := $(shell $(FREETYPE_CONFIG) --prefix)/lib/libfreetype.a |
|
521 endif |
|
522 endif |
|
523 |
516 CFLAGS += $(CCFLAGS_FREETYPE) |
524 CFLAGS += $(CCFLAGS_FREETYPE) |
517 LIBS += $(LDFLAGS_FREETYPE) |
525 LIBS += $(LDFLAGS_FREETYPE) |
518 endif |
526 endif |
519 |
527 |
520 # fontconfig config |
528 # fontconfig config |