27 |
27 |
28 # Hook to include the corresponding custom file, if present. |
28 # Hook to include the corresponding custom file, if present. |
29 $(eval $(call IncludeCustomExtension, lib/Lib-java.desktop.gmk)) |
29 $(eval $(call IncludeCustomExtension, lib/Lib-java.desktop.gmk)) |
30 |
30 |
31 # Prepare the find cache. |
31 # Prepare the find cache. |
32 LIB_java.desktop_SRC_DIRS += $(TOPDIR)/src/java.desktop/*/native |
32 $(eval $(call FillCacheFind, $(wildcard $(TOPDIR)/src/java.desktop/*/native))) |
33 |
|
34 $(eval $(call FillCacheFind, $(wildcard $(LIB_java.desktop_SRC_DIRS)))) |
|
35 |
33 |
36 ################################################################################ |
34 ################################################################################ |
37 # Create the AWT/2D libraries |
35 # Create the AWT/2D libraries |
38 |
36 |
39 include Awt2dLibraries.gmk |
37 include Awt2dLibraries.gmk |
41 ################################################################################ |
39 ################################################################################ |
42 # Create the libjsound library |
40 # Create the libjsound library |
43 |
41 |
44 ifneq ($(OPENJDK_TARGET_OS), aix) |
42 ifneq ($(OPENJDK_TARGET_OS), aix) |
45 |
43 |
46 LIBJSOUND_SRC_DIRS := $(wildcard \ |
|
47 $(TOPDIR)/src/java.desktop/share/native/libjsound \ |
|
48 $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/libjsound \ |
|
49 ) |
|
50 |
|
51 LIBJSOUND_CFLAGS := \ |
44 LIBJSOUND_CFLAGS := \ |
52 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ |
|
53 $(ALSA_CFLAGS) \ |
45 $(ALSA_CFLAGS) \ |
54 $(LIBJAVA_HEADER_FLAGS) \ |
|
55 $(foreach dir, $(LIBJSOUND_SRC_DIRS), -I$(dir)) \ |
|
56 -DX_PLATFORM=X_$(OPENJDK_TARGET_OS_UPPERCASE) \ |
46 -DX_PLATFORM=X_$(OPENJDK_TARGET_OS_UPPERCASE) \ |
57 -DUSE_PORTS=TRUE \ |
47 -DUSE_PORTS=TRUE \ |
58 -DUSE_DAUDIO=TRUE \ |
48 -DUSE_DAUDIO=TRUE \ |
59 # |
49 # |
60 |
50 |
69 LIBJSOUND_TOOLCHAIN := TOOLCHAIN_LINK_CXX |
59 LIBJSOUND_TOOLCHAIN := TOOLCHAIN_LINK_CXX |
70 endif |
60 endif |
71 |
61 |
72 $(eval $(call SetupJdkLibrary, BUILD_LIBJSOUND, \ |
62 $(eval $(call SetupJdkLibrary, BUILD_LIBJSOUND, \ |
73 NAME := jsound, \ |
63 NAME := jsound, \ |
74 SRC := $(LIBJSOUND_SRC_DIRS), \ |
|
75 TOOLCHAIN := $(LIBJSOUND_TOOLCHAIN), \ |
64 TOOLCHAIN := $(LIBJSOUND_TOOLCHAIN), \ |
76 OPTIMIZATION := LOW, \ |
65 OPTIMIZATION := LOW, \ |
77 CFLAGS := $(CFLAGS_JDKLIB) \ |
66 CFLAGS := $(CFLAGS_JDKLIB) \ |
78 $(LIBJSOUND_CFLAGS), \ |
67 $(LIBJSOUND_CFLAGS), \ |
79 CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \ |
68 CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \ |
95 |
84 |
96 ################################################################################ |
85 ################################################################################ |
97 # Create the macosx specific osxapp and osx libraries |
86 # Create the macosx specific osxapp and osx libraries |
98 |
87 |
99 ifeq ($(OPENJDK_TARGET_OS), macosx) |
88 ifeq ($(OPENJDK_TARGET_OS), macosx) |
100 LIBOSXAPP_SRC := $(TOPDIR)/src/java.desktop/macosx/native/libosxapp |
|
101 |
89 |
102 $(eval $(call SetupJdkLibrary, BUILD_LIBOSXAPP, \ |
90 $(eval $(call SetupJdkLibrary, BUILD_LIBOSXAPP, \ |
103 NAME := osxapp, \ |
91 NAME := osxapp, \ |
104 SRC := $(LIBOSXAPP_SRC), \ |
|
105 OPTIMIZATION := LOW, \ |
92 OPTIMIZATION := LOW, \ |
106 CFLAGS := $(CFLAGS_JDKLIB) \ |
93 CFLAGS := $(CFLAGS_JDKLIB), \ |
107 $(addprefix -I, $(LIBOSXAPP_SRC)) \ |
|
108 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \ |
|
109 DISABLED_WARNINGS_clang := objc-method-access objc-root-class \ |
94 DISABLED_WARNINGS_clang := objc-method-access objc-root-class \ |
110 deprecated-declarations, \ |
95 deprecated-declarations, \ |
111 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
96 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
112 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
97 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
113 LIBS := \ |
98 LIBS := \ |
127 |
112 |
128 TARGETS += $(BUILD_LIBOSXAPP) |
113 TARGETS += $(BUILD_LIBOSXAPP) |
129 |
114 |
130 ############################################################################## |
115 ############################################################################## |
131 |
116 |
132 LIBOSX_DIRS := $(TOPDIR)/src/java.desktop/macosx/native/libosx |
|
133 LIBOSX_CFLAGS := -I$(LIBOSX_DIRS) \ |
|
134 -I$(TOPDIR)/src/java.desktop/macosx/native/libosxapp \ |
|
135 $(LIBJAVA_HEADER_FLAGS) \ |
|
136 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ |
|
137 # |
|
138 |
|
139 $(eval $(call SetupJdkLibrary, BUILD_LIBOSX, \ |
117 $(eval $(call SetupJdkLibrary, BUILD_LIBOSX, \ |
140 NAME := osx, \ |
118 NAME := osx, \ |
141 SRC := $(LIBOSX_DIRS), \ |
|
142 OPTIMIZATION := LOW, \ |
119 OPTIMIZATION := LOW, \ |
143 CFLAGS := $(CFLAGS_JDKLIB) \ |
120 CFLAGS := $(CFLAGS_JDKLIB), \ |
144 $(LIBOSX_CFLAGS), \ |
121 EXTRA_HEADER_DIRS := libosxapp, \ |
145 DISABLED_WARNINGS_clang := deprecated-declarations, \ |
122 DISABLED_WARNINGS_clang := deprecated-declarations, \ |
146 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
123 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
147 -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.desktop \ |
124 -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.desktop \ |
148 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
125 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
149 LIBS := \ |
126 LIBS := \ |