equal
deleted
inserted
replaced
131 -framework CoreServices -framework AudioUnit $(LIBCXX) \ |
131 -framework CoreServices -framework AudioUnit $(LIBCXX) \ |
132 -framework CoreMIDI -framework AudioToolbox, \ |
132 -framework CoreMIDI -framework AudioToolbox, \ |
133 LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib winmm.lib, \ |
133 LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib winmm.lib, \ |
134 )) |
134 )) |
135 |
135 |
136 $(BUILD_LIBJSOUND): $(BUILD_LIBJAVA) |
136 $(BUILD_LIBJSOUND): $(call FindLib, java.base, java) |
137 |
137 |
138 TARGETS += $(BUILD_LIBJSOUND) |
138 TARGETS += $(BUILD_LIBJSOUND) |
139 |
139 |
140 ########################################################################################## |
140 ########################################################################################## |
141 |
141 |
164 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
164 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
165 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
165 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
166 LIBS := $(ALSA_LIBS) -ljava -ljvm, \ |
166 LIBS := $(ALSA_LIBS) -ljava -ljvm, \ |
167 )) |
167 )) |
168 |
168 |
169 $(BUILD_LIBJSOUNDALSA): $(BUILD_LIBJAVA) |
169 $(BUILD_LIBJSOUNDALSA): $(call FindLib, java.base, java) |
170 |
170 |
171 TARGETS += $(BUILD_LIBJSOUNDALSA) |
171 TARGETS += $(BUILD_LIBJSOUNDALSA) |
172 |
172 |
173 endif |
173 endif |
174 |
174 |
189 LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ |
189 LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ |
190 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
190 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
191 LIBS := $(JDKLIB_LIBS) dsound.lib winmm.lib user32.lib ole32.lib, \ |
191 LIBS := $(JDKLIB_LIBS) dsound.lib winmm.lib user32.lib ole32.lib, \ |
192 )) |
192 )) |
193 |
193 |
194 $(BUILD_LIBJSOUNDDS): $(BUILD_LIBJAVA) |
194 $(BUILD_LIBJSOUNDDS): $(call FindLib, java.base, java) |
195 |
195 |
196 TARGETS += $(BUILD_LIBJSOUNDDS) |
196 TARGETS += $(BUILD_LIBJSOUNDDS) |
197 |
197 |
198 endif |
198 endif |