23 # questions. |
23 # questions. |
24 # |
24 # |
25 |
25 |
26 # Hook to include the corresponding custom file, if present. |
26 # Hook to include the corresponding custom file, if present. |
27 $(eval $(call IncludeCustomExtension, jdk, lib/Awt2dLibraries.gmk)) |
27 $(eval $(call IncludeCustomExtension, jdk, lib/Awt2dLibraries.gmk)) |
28 |
|
29 # Openwin is defined on Solaris. |
|
30 OPENWIN_LIB := $(OPENWIN_HOME)/lib |
|
31 |
28 |
32 WIN_AWT_LIB := $(JDK_OUTPUTDIR)/objs/libawt/awt.lib |
29 WIN_AWT_LIB := $(JDK_OUTPUTDIR)/objs/libawt/awt.lib |
33 |
30 |
34 ########################################################################################## |
31 ########################################################################################## |
35 |
32 |
479 OPTIMIZATION := LOW, \ |
476 OPTIMIZATION := LOW, \ |
480 CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \ |
477 CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \ |
481 ASFLAGS := $(LIBAWT_ASFLAGS), \ |
478 ASFLAGS := $(LIBAWT_ASFLAGS), \ |
482 MAPFILE := $(LIBAWT_MAPFILE), \ |
479 MAPFILE := $(LIBAWT_MAPFILE), \ |
483 LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \ |
480 LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \ |
484 LDFLAGS_solaris := -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \ |
|
485 LDFLAGS_SUFFIX_linux := -ljvm $(LIBM) $(LIBDL) -ljava, \ |
481 LDFLAGS_SUFFIX_linux := -ljvm $(LIBM) $(LIBDL) -ljava, \ |
486 LDFLAGS_SUFFIX_solaris := -ljvm $(LIBM) $(LIBDL) -ljava -lc, \ |
482 LDFLAGS_SUFFIX_solaris := -ljvm $(LIBM) $(LIBDL) -ljava -lc, \ |
487 LDFLAGS_SUFFIX_aix :=-ljvm $(LIBM) $(LIBDL) -ljava -lm,\ |
483 LDFLAGS_SUFFIX_aix :=-ljvm $(LIBM) $(LIBDL) -ljava -lm,\ |
488 LDFLAGS_SUFFIX_macosx := -lmlib_image -ljvm $(LIBM) \ |
484 LDFLAGS_SUFFIX_macosx := -lmlib_image -ljvm $(LIBM) \ |
489 -framework Cocoa \ |
485 -framework Cocoa \ |
636 OPTIMIZATION := LOW, \ |
632 OPTIMIZATION := LOW, \ |
637 CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \ |
633 CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \ |
638 $(X_CFLAGS), \ |
634 $(X_CFLAGS), \ |
639 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_xawt/mapfile-vers, \ |
635 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_xawt/mapfile-vers, \ |
640 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
636 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
641 $(X_LIBS) $(LIBAWT_XAWT_LDFLAGS), \ |
637 $(X_LIBS) $(LIBAWT_XAWT_LDFLAGS) \ |
642 LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN) \ |
|
643 $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
|
644 LDFLAGS_solaris := -L$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) \ |
|
645 -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) \ |
|
646 -R$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) \ |
|
647 -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) \ |
|
648 -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) \ |
|
649 $(call SET_SHARED_LIBRARY_ORIGIN) \ |
638 $(call SET_SHARED_LIBRARY_ORIGIN) \ |
650 $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
639 $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
651 LDFLAGS_SUFFIX := $(LIBAWT_XAWT_LDFLAGS_SUFFIX), \ |
640 LDFLAGS_SUFFIX := $(LIBAWT_XAWT_LDFLAGS_SUFFIX), \ |
652 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |
641 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |
653 RC_FLAGS := $(RC_FLAGS) \ |
642 RC_FLAGS := $(RC_FLAGS) \ |
974 CFLAGS_linux := $(HEADLESS_CFLAG), \ |
963 CFLAGS_linux := $(HEADLESS_CFLAG), \ |
975 CFLAGS_macosx := -I$(JDK_TOPDIR)/src/solaris/native/sun/awt, \ |
964 CFLAGS_macosx := -I$(JDK_TOPDIR)/src/solaris/native/sun/awt, \ |
976 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjawt/mapfile-vers, \ |
965 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjawt/mapfile-vers, \ |
977 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
966 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
978 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
967 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
979 LDFLAGS_solaris := -L$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \ |
968 LDFLAGS_solaris := $(X_LIBS), \ |
980 LDFLAGS_SUFFIX_linux := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \ |
969 LDFLAGS_SUFFIX_linux := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \ |
981 LDFLAGS_SUFFIX_aix := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX),\ |
970 LDFLAGS_SUFFIX_aix := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX),\ |
982 LDFLAGS_SUFFIX_solaris := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX) -lXrender, \ |
971 LDFLAGS_SUFFIX_solaris := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX) -lXrender, \ |
983 LDFLAGS_SUFFIX_macosx := -Xlinker -rpath -Xlinker @loader_path $(JAWT_LIBS) \ |
972 LDFLAGS_SUFFIX_macosx := -Xlinker -rpath -Xlinker @loader_path $(JAWT_LIBS) \ |
984 -framework Cocoa $(LDFLAGS_JDKLIB_SUFFIX), \ |
973 -framework Cocoa $(LDFLAGS_JDKLIB_SUFFIX), \ |
1072 LANG := C, \ |
1061 LANG := C, \ |
1073 OPTIMIZATION := LOW, \ |
1062 OPTIMIZATION := LOW, \ |
1074 CFLAGS := $(CFLAGS_JDKLIB) \ |
1063 CFLAGS := $(CFLAGS_JDKLIB) \ |
1075 -I$(JDK_TOPDIR)/src/share/javavm/export \ |
1064 -I$(JDK_TOPDIR)/src/share/javavm/export \ |
1076 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export \ |
1065 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export \ |
1077 -I$(OPENWIN_HOME)/include, \ |
1066 $(X_CFLAGS), \ |
1078 MAPFILE := $(SUNWJDGA_MAPFILE), \ |
1067 MAPFILE := $(SUNWJDGA_MAPFILE), \ |
1079 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
1068 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
1080 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
1069 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
1081 LDFLAGS_SUFFIX := -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -ldga -lX11 $(LIBDL) -lc, \ |
1070 LDFLAGS_SUFFIX := $(X_LIBS) -ldga -lX11 $(LIBDL) -lc, \ |
1082 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunwjdga, \ |
1071 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunwjdga, \ |
1083 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
1072 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
1084 |
1073 |
1085 BUILD_LIBRARIES += $(BUILD_LIBSUNWJDGA) |
1074 BUILD_LIBRARIES += $(BUILD_LIBSUNWJDGA) |
1086 |
1075 |
1171 CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_HEADLESS_CFLAGS), \ |
1160 CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_HEADLESS_CFLAGS), \ |
1172 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_headless/mapfile-vers, \ |
1161 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_headless/mapfile-vers, \ |
1173 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
1162 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
1174 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
1163 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
1175 LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
1164 LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
1176 LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..) \ |
1165 LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
1177 -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) \ |
|
1178 -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \ |
|
1179 LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN)., \ |
1166 LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN)., \ |
1180 REORDER := $(LIBAWT_HEADLESS_REORDER), \ |
1167 REORDER := $(LIBAWT_HEADLESS_REORDER), \ |
1181 LDFLAGS_SUFFIX_linux := -ljvm -lawt -lm $(LIBDL) -ljava, \ |
1168 LDFLAGS_SUFFIX_linux := -ljvm -lawt -lm $(LIBDL) -ljava, \ |
1182 LDFLAGS_SUFFIX_aix := -ljvm -lawt -ljava,\ |
1169 LDFLAGS_SUFFIX_aix := -ljvm -lawt -ljava,\ |
1183 LDFLAGS_SUFFIX_solaris := $(LIBDL) -ljvm -lawt -lm -ljava $(LIBCXX) -lc, \ |
1170 LDFLAGS_SUFFIX_solaris := $(LIBDL) -ljvm -lawt -lm -ljava $(LIBCXX) -lc, \ |
1234 LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0 |
1221 LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0 |
1235 LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0 |
1222 LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0 |
1236 |
1223 |
1237 else ifeq ($(OPENJDK_TARGET_OS), windows) |
1224 else ifeq ($(OPENJDK_TARGET_OS), windows) |
1238 LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32 |
1225 LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32 |
1239 else ifeq ($(OPENJDK_TARGET_OS), solaris) |
|
1240 LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions |
|
1241 else |
1226 else |
1242 LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) |
1227 LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) |
1243 endif |
1228 endif |
1244 |
1229 |
1245 LIBSPLASHSCREEN_LDFLAGS_SUFFIX := |
1230 LIBSPLASHSCREEN_LDFLAGS_SUFFIX := |
1256 -framework Cocoa \ |
1241 -framework Cocoa \ |
1257 -F/System/Library/Frameworks/JavaVM.framework/Frameworks \ |
1242 -F/System/Library/Frameworks/JavaVM.framework/Frameworks \ |
1258 -framework JavaNativeFoundation |
1243 -framework JavaNativeFoundation |
1259 else ifeq ($(OPENJDK_TARGET_OS), windows) |
1244 else ifeq ($(OPENJDK_TARGET_OS), windows) |
1260 LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll |
1245 LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll |
1261 else ifeq ($(OPENJDK_TARGET_OS), solaris) |
1246 else |
1262 # Solaris still uses OPENWIN_LIB .. |
|
1263 LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread |
|
1264 else # .. all other Unixes can use X_LIBS |
|
1265 LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread |
1247 LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread |
1266 endif |
1248 endif |
1267 |
1249 |
1268 $(eval $(call SetupNativeCompilation,LIBSPLASHSCREEN, \ |
1250 $(eval $(call SetupNativeCompilation,LIBSPLASHSCREEN, \ |
1269 LIBRARY := splashscreen, \ |
1251 LIBRARY := splashscreen, \ |