equal
deleted
inserted
replaced
35 # Used on openjdk only |
35 # Used on openjdk only |
36 ifeq ($(OPENJDK),true) |
36 ifeq ($(OPENJDK),true) |
37 |
37 |
38 # Start with CFLAGS (which gets us the required -xarch setting on solaris) |
38 # Start with CFLAGS (which gets us the required -xarch setting on solaris) |
39 ifeq ($(PLATFORM), windows) |
39 ifeq ($(PLATFORM), windows) |
40 FT_OPTIONS = /nologo /c |
40 FT_OPTIONS = -nologo -c |
41 FREETYPE_DLL = $(FREETYPE_LIB_PATH)/freetype.dll |
41 FREETYPE_DLL = $(FREETYPE_LIB_PATH)/freetype.dll |
42 FT_LD_OPTIONS = $(FREETYPE_LIB_PATH)/freetype.lib |
42 FT_LD_OPTIONS = $(FREETYPE_LIB_PATH)/freetype.lib |
43 ifdef MT |
43 ifdef MT |
44 FT_LD_OPTIONS += /manifest |
44 FT_LD_OPTIONS += -manifest |
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 |
70 # at runtime |
70 # at runtime |
71 $(FT_TEST): freetypecheck.c |
71 $(FT_TEST): freetypecheck.c |
72 $(prep-target) |
72 $(prep-target) |
73 ifeq ($(PLATFORM), windows) |
73 ifeq ($(PLATFORM), windows) |
74 $(CC) $(FT_OPTIONS) $(CC_OBJECT_OUTPUT_FLAG)$(FT_OBJ) $< |
74 $(CC) $(FT_OPTIONS) $(CC_OBJECT_OUTPUT_FLAG)$(FT_OBJ) $< |
75 $(LINK) $(FT_LD_OPTIONS) /OUT:$(FT_TEST) $(FT_OBJ) |
75 $(LINK) $(FT_LD_OPTIONS) -OUT:$(FT_TEST) $(FT_OBJ) |
76 $(CP) $(FREETYPE_DLL) $(@D)/ |
76 $(CP) $(FREETYPE_DLL) $(@D)/ |
77 ifdef MT |
77 ifdef MT |
78 $(CP) $(MSVCRNN_DLL_PATH)/$(MSVCRNN_DLL) $(@D)/ |
78 $(CP) $(MSVCRNN_DLL_PATH)/$(MSVCRNN_DLL) $(@D)/ |
79 $(MT) /manifest $(FT_TEST).manifest /outputresource:$(FT_TEST);#1 |
79 $(MT) -manifest $(FT_TEST).manifest -outputresource:$(FT_TEST);#1 |
80 endif |
80 endif |
81 else |
81 else |
82 @$(CC) $(FT_OPTIONS) -o $@ $< $(FT_LD_OPTIONS) |
82 @$(CC) $(FT_OPTIONS) -o $@ $< $(FT_LD_OPTIONS) |
83 endif |
83 endif |
84 |
84 |