41 ################################################################################ |
41 ################################################################################ |
42 # Create the libjsound library |
42 # Create the libjsound library |
43 |
43 |
44 ifneq ($(OPENJDK_TARGET_OS), aix) |
44 ifneq ($(OPENJDK_TARGET_OS), aix) |
45 |
45 |
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 := \ |
46 LIBJSOUND_CFLAGS := \ |
52 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ |
|
53 $(ALSA_CFLAGS) \ |
47 $(ALSA_CFLAGS) \ |
54 $(LIBJAVA_HEADER_FLAGS) \ |
|
55 $(foreach dir, $(LIBJSOUND_SRC_DIRS), -I$(dir)) \ |
|
56 -DX_PLATFORM=X_$(OPENJDK_TARGET_OS_UPPERCASE) \ |
48 -DX_PLATFORM=X_$(OPENJDK_TARGET_OS_UPPERCASE) \ |
57 -DUSE_PORTS=TRUE \ |
49 -DUSE_PORTS=TRUE \ |
58 -DUSE_DAUDIO=TRUE \ |
50 -DUSE_DAUDIO=TRUE \ |
59 # |
51 # |
60 |
52 |
69 LIBJSOUND_TOOLCHAIN := TOOLCHAIN_LINK_CXX |
61 LIBJSOUND_TOOLCHAIN := TOOLCHAIN_LINK_CXX |
70 endif |
62 endif |
71 |
63 |
72 $(eval $(call SetupJdkLibrary, BUILD_LIBJSOUND, \ |
64 $(eval $(call SetupJdkLibrary, BUILD_LIBJSOUND, \ |
73 NAME := jsound, \ |
65 NAME := jsound, \ |
74 SRC := $(LIBJSOUND_SRC_DIRS), \ |
|
75 TOOLCHAIN := $(LIBJSOUND_TOOLCHAIN), \ |
66 TOOLCHAIN := $(LIBJSOUND_TOOLCHAIN), \ |
76 OPTIMIZATION := LOW, \ |
67 OPTIMIZATION := LOW, \ |
77 CFLAGS := $(CFLAGS_JDKLIB) \ |
68 CFLAGS := $(CFLAGS_JDKLIB) \ |
78 $(LIBJSOUND_CFLAGS), \ |
69 $(LIBJSOUND_CFLAGS), \ |
|
70 HEADER_FLAGS := \ |
|
71 $(LIBJAVA_HEADER_FLAGS) \ |
|
72 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \ |
79 CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \ |
73 CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \ |
80 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
74 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
81 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
75 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
82 LIBS_unix := -ljava -ljvm, \ |
76 LIBS_unix := -ljava -ljvm, \ |
83 LIBS_linux := $(ALSA_LIBS), \ |
77 LIBS_linux := $(ALSA_LIBS), \ |
95 |
89 |
96 ################################################################################ |
90 ################################################################################ |
97 # Create the macosx specific osxapp and osx libraries |
91 # Create the macosx specific osxapp and osx libraries |
98 |
92 |
99 ifeq ($(OPENJDK_TARGET_OS), macosx) |
93 ifeq ($(OPENJDK_TARGET_OS), macosx) |
100 LIBOSXAPP_SRC := $(TOPDIR)/src/java.desktop/macosx/native/libosxapp |
|
101 |
|
102 $(eval $(call SetupJdkLibrary, BUILD_LIBOSXAPP, \ |
94 $(eval $(call SetupJdkLibrary, BUILD_LIBOSXAPP, \ |
103 NAME := osxapp, \ |
95 NAME := osxapp, \ |
104 SRC := $(LIBOSXAPP_SRC), \ |
|
105 OPTIMIZATION := LOW, \ |
96 OPTIMIZATION := LOW, \ |
106 CFLAGS := $(CFLAGS_JDKLIB) \ |
97 CFLAGS := $(CFLAGS_JDKLIB), \ |
107 $(addprefix -I, $(LIBOSXAPP_SRC)) \ |
98 HEADER_FLAGS := -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \ |
108 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \ |
|
109 DISABLED_WARNINGS_clang := objc-method-access objc-root-class \ |
99 DISABLED_WARNINGS_clang := objc-method-access objc-root-class \ |
110 deprecated-declarations, \ |
100 deprecated-declarations, \ |
111 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
101 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
112 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
102 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
113 LIBS := \ |
103 LIBS := \ |
127 |
117 |
128 TARGETS += $(BUILD_LIBOSXAPP) |
118 TARGETS += $(BUILD_LIBOSXAPP) |
129 |
119 |
130 ############################################################################## |
120 ############################################################################## |
131 |
121 |
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, \ |
122 $(eval $(call SetupJdkLibrary, BUILD_LIBOSX, \ |
140 NAME := osx, \ |
123 NAME := osx, \ |
141 SRC := $(LIBOSX_DIRS), \ |
|
142 OPTIMIZATION := LOW, \ |
124 OPTIMIZATION := LOW, \ |
143 CFLAGS := $(CFLAGS_JDKLIB) \ |
125 CFLAGS := $(CFLAGS_JDKLIB), \ |
144 $(LIBOSX_CFLAGS), \ |
126 HEADER_FLAGS := \ |
|
127 -I$(TOPDIR)/src/java.desktop/macosx/native/libosxapp \ |
|
128 $(LIBJAVA_HEADER_FLAGS) \ |
|
129 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \ |
145 DISABLED_WARNINGS_clang := deprecated-declarations, \ |
130 DISABLED_WARNINGS_clang := deprecated-declarations, \ |
146 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
131 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
147 -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.desktop \ |
132 -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.desktop \ |
148 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
133 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
149 LIBS := \ |
134 LIBS := \ |