equal
deleted
inserted
replaced
34 BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \ |
34 BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \ |
35 $(addprefix -I, $(BUILD_LIBMLIB_SRC)) \ |
35 $(addprefix -I, $(BUILD_LIBMLIB_SRC)) \ |
36 -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libmlib_image |
36 -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libmlib_image |
37 |
37 |
38 BUILD_LIBMLIB_LDLIBS := |
38 BUILD_LIBMLIB_LDLIBS := |
39 BUILD_LIBMLIB_IMAGE_MAPFILE := $(TOPDIR)/make/mapfiles/libmlib_image/mapfile-vers |
|
40 |
39 |
41 BUILD_LIBMLIB_CFLAGS += -DMLIB_NO_LIBSUNMATH |
40 BUILD_LIBMLIB_CFLAGS += -DMLIB_NO_LIBSUNMATH |
42 |
41 |
43 ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) |
42 ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) |
44 BUILD_LIBMLIB_CFLAGS += -DMLIB_OS64BIT |
43 BUILD_LIBMLIB_CFLAGS += -DMLIB_OS64BIT |
54 SRC := $(BUILD_LIBMLIB_SRC), \ |
53 SRC := $(BUILD_LIBMLIB_SRC), \ |
55 EXCLUDE_FILES := mlib_c_ImageBlendTable.c, \ |
54 EXCLUDE_FILES := mlib_c_ImageBlendTable.c, \ |
56 OPTIMIZATION := HIGHEST, \ |
55 OPTIMIZATION := HIGHEST, \ |
57 CFLAGS := $(CFLAGS_JDKLIB) \ |
56 CFLAGS := $(CFLAGS_JDKLIB) \ |
58 $(BUILD_LIBMLIB_CFLAGS), \ |
57 $(BUILD_LIBMLIB_CFLAGS), \ |
59 MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \ |
|
60 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
58 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
61 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
59 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
62 LIBS := $(BUILD_LIBMLIB_LDLIBS) \ |
60 LIBS := $(BUILD_LIBMLIB_LDLIBS) \ |
63 $(JDKLIB_LIBS), \ |
61 $(JDKLIB_LIBS), \ |
64 LIBS_solaris := -lc, \ |
62 LIBS_solaris := -lc, \ |
114 EXCLUDE_FILES := $(BUILD_LIBMLIB_IMAGE_V_EXFILES), \ |
112 EXCLUDE_FILES := $(BUILD_LIBMLIB_IMAGE_V_EXFILES), \ |
115 OPTIMIZATION := HIGHEST, \ |
113 OPTIMIZATION := HIGHEST, \ |
116 CFLAGS := -xarch=sparcvis \ |
114 CFLAGS := -xarch=sparcvis \ |
117 $(LIBMLIB_IMAGE_V_CFLAGS) \ |
115 $(LIBMLIB_IMAGE_V_CFLAGS) \ |
118 $(CFLAGS_JDKLIB), \ |
116 $(CFLAGS_JDKLIB), \ |
119 MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \ |
|
120 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
117 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
121 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
118 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
122 LIBS := -ljava -ljvm -lc $(BUILD_LIBMLIB_LDLIBS), \ |
119 LIBS := -ljava -ljvm -lc $(BUILD_LIBMLIB_LDLIBS), \ |
123 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libmlib_image_v, \ |
120 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libmlib_image_v, \ |
124 )) |
121 )) |