equal
deleted
inserted
replaced
45 endif |
45 endif |
46 else |
46 else |
47 FT_OPTIONS = $(CFLAGS) |
47 FT_OPTIONS = $(CFLAGS) |
48 FT_LD_OPTIONS = -L$(FREETYPE_LIB_PATH) |
48 FT_LD_OPTIONS = -L$(FREETYPE_LIB_PATH) |
49 # Add runtime lib search path to ensure test will be runnable |
49 # Add runtime lib search path to ensure test will be runnable |
50 ifeq ($(PLATFORM), linux) |
50 ifeq ($(PLATFORM), solaris) |
51 FT_LD_OPTIONS += -Wl,-rpath -Wl,$(FREETYPE_LIB_PATH) |
51 FT_LD_OPTIONS += -R $(FREETYPE_LIB_PATH) -lfreetype |
52 else # other unix |
52 else |
53 FT_LD_OPTIONS += -R $(FREETYPE_LIB_PATH) |
53 ifeq ($(PLATFORM), macosx) |
|
54 FT_LD_OPTIONS += -lfreetype -lz |
|
55 else # linux |
|
56 FT_LD_OPTIONS += -Wl,-rpath -Wl,$(FREETYPE_LIB_PATH) -lfreetype |
|
57 endif |
54 endif |
58 endif |
55 FT_LD_OPTIONS += -lfreetype |
|
56 endif |
59 endif |
57 FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH) |
60 FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH) |
58 FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH)/freetype2 |
61 FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH)/freetype2 |
59 FT_OPTIONS += -DREQUIRED_FREETYPE_VERSION=$(REQUIRED_FREETYPE_VERSION) |
62 FT_OPTIONS += -DREQUIRED_FREETYPE_VERSION=$(REQUIRED_FREETYPE_VERSION) |
60 FT_LD_OPTIONS += $(LFLAGS_$(COMPILER_VERSION)) |
63 FT_LD_OPTIONS += $(LFLAGS_$(COMPILER_VERSION)) |