equal
deleted
inserted
replaced
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 := \ |
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 aix)) |
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 |