comparison make/lib/SoundLibraries.gmk @ 9190:6210b60a16ea

Merge
author kvn
date Thu, 05 Dec 2013 15:10:36 -0800
parents makefiles/lib/SoundLibraries.gmk@48e71aa633bd makefiles/lib/SoundLibraries.gmk@4be14673b9bf
children ec7671728ca5
comparison
equal deleted inserted replaced
3:bc17199f47b2 2:3ff1452a8bb2
151 LANG := $(LIBJSOUND_LANG), \ 151 LANG := $(LIBJSOUND_LANG), \
152 OPTIMIZATION := LOW, \ 152 OPTIMIZATION := LOW, \
153 CFLAGS := $(CFLAGS_JDKLIB) \ 153 CFLAGS := $(CFLAGS_JDKLIB) \
154 $(LIBJSOUND_CFLAGS), \ 154 $(LIBJSOUND_CFLAGS), \
155 CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \ 155 CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \
156 MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjsound/mapfile-vers, \ 156 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjsound/mapfile-vers, \
157 LDFLAGS := $(LDFLAGS_JDKLIB) \ 157 LDFLAGS := $(LDFLAGS_JDKLIB) \
158 $(call SET_SHARED_LIBRARY_ORIGIN), \ 158 $(call SET_SHARED_LIBRARY_ORIGIN), \
159 LDFLAGS_macosx := -framework CoreAudio -framework CoreFoundation \ 159 LDFLAGS_macosx := -framework CoreAudio -framework CoreFoundation \
160 -framework CoreServices -framework AudioUnit $(LIBCXX) \ 160 -framework CoreServices -framework AudioUnit $(LIBCXX) \
161 -framework CoreMIDI -framework AudioToolbox, \ 161 -framework CoreMIDI -framework AudioToolbox, \
197 $(LIBJSOUND_CFLAGS) \ 197 $(LIBJSOUND_CFLAGS) \
198 -DUSE_DAUDIO=TRUE \ 198 -DUSE_DAUDIO=TRUE \
199 -DUSE_PORTS=TRUE \ 199 -DUSE_PORTS=TRUE \
200 -DUSE_PLATFORM_MIDI_OUT=TRUE \ 200 -DUSE_PLATFORM_MIDI_OUT=TRUE \
201 -DUSE_PLATFORM_MIDI_IN=TRUE, \ 201 -DUSE_PLATFORM_MIDI_IN=TRUE, \
202 MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjsoundalsa/mapfile-vers, \ 202 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjsoundalsa/mapfile-vers, \
203 LDFLAGS := $(LDFLAGS_JDKLIB) \ 203 LDFLAGS := $(LDFLAGS_JDKLIB) \
204 $(call SET_SHARED_LIBRARY_ORIGIN), \ 204 $(call SET_SHARED_LIBRARY_ORIGIN), \
205 LDFLAGS_SUFFIX := $(ALSA_LIBS) -ljava -ljvm, \ 205 LDFLAGS_SUFFIX := $(ALSA_LIBS) -ljava -ljvm, \
206 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsoundalsa, \ 206 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsoundalsa, \
207 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) 207 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))