229 else ifneq ($(OPENJDK_TARGET_OS), macosx) |
229 else ifneq ($(OPENJDK_TARGET_OS), macosx) |
230 LIBAWT_DIRS += \ |
230 LIBAWT_DIRS += \ |
231 $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11 |
231 $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11 |
232 endif |
232 endif |
233 |
233 |
|
234 ifeq ($(OPENJDK_TARGET_OS), aix) |
|
235 LIBAWT_DIRS += $(JDK_TOPDIR)/src/aix/porting |
|
236 endif |
|
237 |
234 LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \ |
238 LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \ |
235 $(X_CFLAGS) \ |
239 $(X_CFLAGS) \ |
236 $(foreach dir, $(LIBAWT_DIRS), -I$(dir)) |
240 $(foreach dir, $(LIBAWT_DIRS), -I$(dir)) |
237 |
241 |
238 LIBAWT_FILES := \ |
242 LIBAWT_FILES := \ |
303 debug_assert.c \ |
307 debug_assert.c \ |
304 debug_mem.c \ |
308 debug_mem.c \ |
305 debug_trace.c \ |
309 debug_trace.c \ |
306 debug_util.c |
310 debug_util.c |
307 |
311 |
308 ifneq (, $(filter $(OPENJDK_TARGET_OS), solaris linux)) |
312 ifneq (, $(filter $(OPENJDK_TARGET_OS), solaris linux aix)) |
309 LIBAWT_FILES += awt_LoadLibrary.c initIDs.c img_colors.c |
313 LIBAWT_FILES += awt_LoadLibrary.c initIDs.c img_colors.c |
|
314 endif |
|
315 |
|
316 ifeq ($(OPENJDK_TARGET_OS), aix) |
|
317 LIBAWT_FILES += porting_aix.c |
310 endif |
318 endif |
311 |
319 |
312 ifeq ($(OPENJDK_TARGET_OS), macosx) |
320 ifeq ($(OPENJDK_TARGET_OS), macosx) |
313 LIBAWT_FILES += awt_LoadLibrary.c img_colors.c |
321 LIBAWT_FILES += awt_LoadLibrary.c img_colors.c |
314 LIBAWT_CFLAGS += -F/System/Library/Frameworks/JavaVM.framework/Frameworks |
322 LIBAWT_CFLAGS += -F/System/Library/Frameworks/JavaVM.framework/Frameworks |
471 MAPFILE := $(LIBAWT_MAPFILE), \ |
479 MAPFILE := $(LIBAWT_MAPFILE), \ |
472 LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \ |
480 LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \ |
473 LDFLAGS_solaris := -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \ |
481 LDFLAGS_solaris := -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \ |
474 LDFLAGS_SUFFIX_linux := -ljvm $(LIBM) $(LIBDL) -ljava, \ |
482 LDFLAGS_SUFFIX_linux := -ljvm $(LIBM) $(LIBDL) -ljava, \ |
475 LDFLAGS_SUFFIX_solaris := -ljvm $(LIBM) $(LIBDL) -ljava -lc, \ |
483 LDFLAGS_SUFFIX_solaris := -ljvm $(LIBM) $(LIBDL) -ljava -lc, \ |
|
484 LDFLAGS_SUFFIX_aix :=-ljvm $(LIBM) $(LIBDL) -ljava -lm,\ |
476 LDFLAGS_SUFFIX_macosx := -lmlib_image -ljvm $(LIBM) \ |
485 LDFLAGS_SUFFIX_macosx := -lmlib_image -ljvm $(LIBM) \ |
477 -framework Cocoa \ |
486 -framework Cocoa \ |
478 -framework OpenGL \ |
487 -framework OpenGL \ |
479 -F/System/Library/Frameworks/JavaVM.framework/Frameworks \ |
488 -F/System/Library/Frameworks/JavaVM.framework/Frameworks \ |
480 -framework JavaNativeFoundation \ |
489 -framework JavaNativeFoundation \ |
679 LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \ |
688 LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \ |
680 LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \ |
689 LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \ |
681 LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc, \ |
690 LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc, \ |
682 LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \ |
691 LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \ |
683 LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm, \ |
692 LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm, \ |
|
693 LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm,\ |
684 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |
694 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |
685 RC_FLAGS := $(RC_FLAGS) \ |
695 RC_FLAGS := $(RC_FLAGS) \ |
686 -D "JDK_FNAME=lcms.dll" \ |
696 -D "JDK_FNAME=lcms.dll" \ |
687 -D "JDK_INTERNAL_NAME=lcms" \ |
697 -D "JDK_INTERNAL_NAME=lcms" \ |
688 -D "JDK_FTYPE=0x2L", \ |
698 -D "JDK_FTYPE=0x2L", \ |
817 LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \ |
827 LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \ |
818 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
828 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
819 LDFLAGS_SUFFIX := $(BUILD_LIBFONTMANAGER_FONTLIB), \ |
829 LDFLAGS_SUFFIX := $(BUILD_LIBFONTMANAGER_FONTLIB), \ |
820 LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \ |
830 LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \ |
821 LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \ |
831 LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \ |
|
832 LDFLAGS_SUFFIX_aix := -lawt -lawt_xawt $(LIBM) $(LIBCXX) -ljava -ljvm,\ |
822 LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \ |
833 LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \ |
823 -ljava -ljvm, \ |
834 -ljava -ljvm, \ |
824 LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ |
835 LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ |
825 $(WIN_AWT_LIB), \ |
836 $(WIN_AWT_LIB), \ |
826 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |
837 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |
831 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfontmanager, \ |
842 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfontmanager, \ |
832 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
843 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
833 |
844 |
834 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT) |
845 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT) |
835 |
846 |
836 ifeq ($(OPENJDK_TARGET_OS), solaris) |
847 ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix)) |
837 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_XAWT) |
848 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_XAWT) |
838 endif |
849 endif |
839 |
850 |
840 BUILD_LIBRARIES += $(BUILD_LIBFONTMANAGER) |
851 BUILD_LIBRARIES += $(BUILD_LIBFONTMANAGER) |
841 |
852 |
966 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjawt/mapfile-vers, \ |
977 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjawt/mapfile-vers, \ |
967 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
978 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
968 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
979 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
969 LDFLAGS_solaris := -L$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \ |
980 LDFLAGS_solaris := -L$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \ |
970 LDFLAGS_SUFFIX_linux := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \ |
981 LDFLAGS_SUFFIX_linux := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \ |
|
982 LDFLAGS_SUFFIX_aix := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX),\ |
971 LDFLAGS_SUFFIX_solaris := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX) -lXrender, \ |
983 LDFLAGS_SUFFIX_solaris := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX) -lXrender, \ |
972 LDFLAGS_SUFFIX_macosx := -Xlinker -rpath -Xlinker @loader_path $(JAWT_LIBS) \ |
984 LDFLAGS_SUFFIX_macosx := -Xlinker -rpath -Xlinker @loader_path $(JAWT_LIBS) \ |
973 -framework Cocoa $(LDFLAGS_JDKLIB_SUFFIX), \ |
985 -framework Cocoa $(LDFLAGS_JDKLIB_SUFFIX), \ |
974 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawt, \ |
986 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawt, \ |
975 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
987 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
1166 -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) \ |
1178 -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) \ |
1167 -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \ |
1179 -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \ |
1168 LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN)., \ |
1180 LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN)., \ |
1169 REORDER := $(LIBAWT_HEADLESS_REORDER), \ |
1181 REORDER := $(LIBAWT_HEADLESS_REORDER), \ |
1170 LDFLAGS_SUFFIX_linux := -ljvm -lawt -lm $(LIBDL) -ljava, \ |
1182 LDFLAGS_SUFFIX_linux := -ljvm -lawt -lm $(LIBDL) -ljava, \ |
|
1183 LDFLAGS_SUFFIX_aix := -ljvm -lawt -ljava,\ |
1171 LDFLAGS_SUFFIX_solaris := $(LIBDL) -ljvm -lawt -lm -ljava $(LIBCXX) -lc, \ |
1184 LDFLAGS_SUFFIX_solaris := $(LIBDL) -ljvm -lawt -lm -ljava $(LIBCXX) -lc, \ |
1172 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_headless, \ |
1185 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_headless, \ |
1173 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
1186 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
1174 |
1187 |
1175 $(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT) |
1188 $(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT) |