Index: zmk/portaudio_v18_1/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/zap/zmk/portaudio_v18_1/Attic/Makefile.in,v retrieving revision 1.1.2.1 diff -u -4 -r1.1.2.1 Makefile.in --- zmk/portaudio_v18_1/Makefile.in 16 Aug 2005 20:03:59 -0000 1.1.2.1 +++ zmk/portaudio_v18_1/Makefile.in 25 Aug 2005 20:39:49 -0000 @@ -38,8 +38,16 @@ endif #XXX Mac build +ifeq ($(OS_ARCH),Darwin) +CSRCS +=\ + pa_mac_core/pa_mac_core.c\ + pablio/ringbuffer.c\ + $(NULL) +OS_LIBS += -framework CoreAudio -framework AudioToolbox +endif + SIMPLE_PROGRAMS = \ pa_tests/debug_convert$(BIN_SUFFIX) \ pa_tests/debug_dither_calc$(BIN_SUFFIX) \ pa_tests/debug_dual$(BIN_SUFFIX) \ @@ -84,9 +92,9 @@ include $(topsrcdir)/config/rules.mk -LOCAL_INCLUDES = -I$(srcdir)/pa_common +LOCAL_INCLUDES = -I$(srcdir)/pa_common -I$(srcdir)/pablio # The portaudio code is dispersed over several subdirectory, but # building separate libs is overkill. We drive the whole build from # this Makefile, but we need to make sure that the object dirs exist: @@ -95,8 +103,10 @@ pa_win_wmme \ pa_win_ds \ pa_unix_oss \ pa_tests \ + pa_mac_core\ + pablio\ $(NULL) export:: mkdir -p $(EXTRA_OBJDIRS) Index: zmk/src/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/zap/zmk/src/Attic/Makefile.in,v retrieving revision 1.1.2.2 diff -u -4 -r1.1.2.2 Makefile.in --- zmk/src/Makefile.in 17 Aug 2005 10:37:03 -0000 1.1.2.2 +++ zmk/src/Makefile.in 25 Aug 2005 20:39:50 -0000 @@ -70,8 +70,12 @@ ifeq ($(OS_ARCH),WINNT) OS_LIBS += dsound.lib winmm.lib endif +ifeq ($(OS_ARCH),Darwin) +OS_LIBS += -framework CoreAudio -framework AudioToolbox +endif + include $(topsrcdir)/config/rules.mk EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)