equal
deleted
inserted
replaced
58 MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \ |
58 MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \ |
59 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
59 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
60 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
60 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
61 LIBS := $(BUILD_LIBMLIB_LDLIBS) \ |
61 LIBS := $(BUILD_LIBMLIB_LDLIBS) \ |
62 $(JDKLIB_LIBS), \ |
62 $(JDKLIB_LIBS), \ |
63 LIBS_solaris := -lc, \ |
|
64 )) |
63 )) |
65 |
64 |
66 $(BUILD_LIBMLIB_IMAGE): $(call FindLib, java.base, java) |
65 $(BUILD_LIBMLIB_IMAGE): $(call FindLib, java.base, java) |
67 |
66 |
68 TARGETS += $(BUILD_LIBMLIB_IMAGE) |
67 TARGETS += $(BUILD_LIBMLIB_IMAGE) |
109 $(LIBMLIB_IMAGE_V_CFLAGS) \ |
108 $(LIBMLIB_IMAGE_V_CFLAGS) \ |
110 $(CFLAGS_JDKLIB), \ |
109 $(CFLAGS_JDKLIB), \ |
111 MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \ |
110 MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \ |
112 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
111 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
113 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
112 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
114 LIBS := -ljava -ljvm -lc $(BUILD_LIBMLIB_LDLIBS), \ |
113 LIBS := -ljava -ljvm $(BUILD_LIBMLIB_LDLIBS), \ |
115 )) |
114 )) |
116 |
115 |
117 $(BUILD_LIBMLIB_IMAGE_V): $(call FindLib, java.base, java) |
116 $(BUILD_LIBMLIB_IMAGE_V): $(call FindLib, java.base, java) |
118 |
117 |
119 TARGETS += $(BUILD_LIBMLIB_IMAGE_V) |
118 TARGETS += $(BUILD_LIBMLIB_IMAGE_V) |
238 -delayload:winspool.drv -delayload:imm32.dll \ |
237 -delayload:winspool.drv -delayload:imm32.dll \ |
239 -delayload:ole32.dll -delayload:comdlg32.dll \ |
238 -delayload:ole32.dll -delayload:comdlg32.dll \ |
240 -delayload:comctl32.dll -delayload:shlwapi.dll, \ |
239 -delayload:comctl32.dll -delayload:shlwapi.dll, \ |
241 LIBS_unix := -ljvm -ljava $(LIBM), \ |
240 LIBS_unix := -ljvm -ljava $(LIBM), \ |
242 LIBS_linux := $(LIBDL), \ |
241 LIBS_linux := $(LIBDL), \ |
243 LIBS_solaris := $(LIBDL) -lc, \ |
242 LIBS_solaris := $(LIBDL), \ |
244 LIBS_aix := $(LIBDL),\ |
243 LIBS_aix := $(LIBDL),\ |
245 LIBS_macosx := -lmlib_image \ |
244 LIBS_macosx := -lmlib_image \ |
246 -framework Cocoa \ |
245 -framework Cocoa \ |
247 -framework OpenGL \ |
246 -framework OpenGL \ |
248 -framework JavaNativeFoundation \ |
247 -framework JavaNativeFoundation \ |
317 ifeq ($(DISABLE_XRENDER), true) |
316 ifeq ($(DISABLE_XRENDER), true) |
318 LIBAWT_XAWT_CFLAGS += -DDISABLE_XRENDER_BY_DEFAULT=true |
317 LIBAWT_XAWT_CFLAGS += -DDISABLE_XRENDER_BY_DEFAULT=true |
319 endif |
318 endif |
320 endif |
319 endif |
321 |
320 |
322 LIBAWT_XAWT_LIBS := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm -lc |
321 LIBAWT_XAWT_LIBS := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm |
323 |
322 |
324 ifeq ($(OPENJDK_TARGET_OS), linux) |
323 ifeq ($(OPENJDK_TARGET_OS), linux) |
325 LIBAWT_XAWT_LIBS += -lpthread |
324 LIBAWT_XAWT_LIBS += -lpthread |
326 endif |
325 endif |
327 |
326 |
412 LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
411 LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
413 LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \ |
412 LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \ |
414 LIBS_unix := -lawt -ljvm -ljava $(LCMS_LIBS), \ |
413 LIBS_unix := -lawt -ljvm -ljava $(LCMS_LIBS), \ |
415 LIBS_linux := $(LIBM), \ |
414 LIBS_linux := $(LIBM), \ |
416 LIBS_macosx := $(LIBM), \ |
415 LIBS_macosx := $(LIBM), \ |
417 LIBS_solaris := -lc, \ |
|
418 LIBS_aix := $(LIBM),\ |
416 LIBS_aix := $(LIBM),\ |
419 LIBS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \ |
417 LIBS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \ |
420 )) |
418 )) |
421 |
419 |
422 TARGETS += $(BUILD_LIBLCMS) |
420 TARGETS += $(BUILD_LIBLCMS) |
538 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
536 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
539 LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
537 LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
540 REORDER := $(LIBAWT_HEADLESS_REORDER), \ |
538 REORDER := $(LIBAWT_HEADLESS_REORDER), \ |
541 LIBS_unix := -lawt -ljvm -ljava, \ |
539 LIBS_unix := -lawt -ljvm -ljava, \ |
542 LIBS_linux := $(LIBM) $(LIBDL), \ |
540 LIBS_linux := $(LIBM) $(LIBDL), \ |
543 LIBS_solaris := $(LIBM) $(LIBDL) $(LIBCXX) -lc, \ |
541 LIBS_solaris := $(LIBM) $(LIBDL) $(LIBCXX), \ |
544 )) |
542 )) |
545 |
543 |
546 # AIX warning explanation: |
544 # AIX warning explanation: |
547 # 1506-356 : (W) Compilation unit is empty. |
545 # 1506-356 : (W) Compilation unit is empty. |
548 # This happens during the headless build |
546 # This happens during the headless build |
578 E_STATEMENT_NOT_REACHED \ |
576 E_STATEMENT_NOT_REACHED \ |
579 E_END_OF_LOOP_CODE_NOT_REACHED, \ |
577 E_END_OF_LOOP_CODE_NOT_REACHED, \ |
580 DISABLED_WARNINGS_microsoft := 4267 2220 4244, \ |
578 DISABLED_WARNINGS_microsoft := 4267 2220 4244, \ |
581 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
579 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
582 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
580 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
583 LIBS_solaris := -lc, \ |
|
584 )) |
581 )) |
585 |
582 |
586 TARGETS += $(BUILD_LIBFREETYPE) |
583 TARGETS += $(BUILD_LIBFREETYPE) |
587 endif |
584 endif |
588 |
585 |
690 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
687 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
691 LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
688 LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
692 LDFLAGS_macosx := -undefined dynamic_lookup, \ |
689 LDFLAGS_macosx := -undefined dynamic_lookup, \ |
693 LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \ |
690 LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \ |
694 LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ |
691 LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ |
695 LIBS_linux := -lc, \ |
|
696 LIBS_solaris := -lc, \ |
|
697 LIBS_aix := -lawt_headless,\ |
692 LIBS_aix := -lawt_headless,\ |
698 LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ |
693 LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ |
699 $(WIN_AWT_LIB), \ |
694 $(WIN_AWT_LIB), \ |
700 )) |
695 )) |
701 |
696 |