equal
deleted
inserted
replaced
27 |
27 |
28 ifeq ($(OPENJDK_TARGET_OS), macosx) |
28 ifeq ($(OPENJDK_TARGET_OS), macosx) |
29 |
29 |
30 LIBOSXAPP_SRC := $(TOPDIR)/src/java.desktop/macosx/native/libosxapp |
30 LIBOSXAPP_SRC := $(TOPDIR)/src/java.desktop/macosx/native/libosxapp |
31 |
31 |
32 $(eval $(call SetupNativeCompilation, BUILD_LIBOSXAPP, \ |
32 $(eval $(call SetupJdkLibrary, BUILD_LIBOSXAPP, \ |
33 NAME := osxapp, \ |
33 NAME := osxapp, \ |
34 OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
|
35 SRC := $(LIBOSXAPP_SRC), \ |
34 SRC := $(LIBOSXAPP_SRC), \ |
36 OPTIMIZATION := LOW, \ |
35 OPTIMIZATION := LOW, \ |
37 CFLAGS := $(CFLAGS_JDKLIB) \ |
36 CFLAGS := $(CFLAGS_JDKLIB) \ |
38 $(addprefix -I, $(LIBOSXAPP_SRC)) \ |
37 $(addprefix -I, $(LIBOSXAPP_SRC)) \ |
39 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \ |
38 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \ |
51 -framework JavaNativeFoundation \ |
50 -framework JavaNativeFoundation \ |
52 -framework JavaRuntimeSupport \ |
51 -framework JavaRuntimeSupport \ |
53 -framework OpenGL \ |
52 -framework OpenGL \ |
54 -framework IOSurface \ |
53 -framework IOSurface \ |
55 -framework QuartzCore, \ |
54 -framework QuartzCore, \ |
56 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxapp, \ |
|
57 )) |
55 )) |
58 |
56 |
59 TARGETS += $(BUILD_LIBOSXAPP) |
57 TARGETS += $(BUILD_LIBOSXAPP) |
60 |
58 |
61 endif |
59 endif |