diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-11-03 11:56:57 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-11-03 11:56:57 -0500 |
| commit | 2d4aca6d0036937afadfb93359d31fe3b4eabf84 (patch) | |
| tree | c946f3a7500c91df93b1a25a38ade9411fe64462 /media/libcubeb/src/moz.build | |
| parent | 302bf1b523012e11b60425d6eee1221ebc2724eb (diff) | |
| parent | 6ee3467a6cfa5a4bd5ca252e00e1b58c469a5011 (diff) | |
| download | UXP-2d4aca6d0036937afadfb93359d31fe3b4eabf84.tar UXP-2d4aca6d0036937afadfb93359d31fe3b4eabf84.tar.gz UXP-2d4aca6d0036937afadfb93359d31fe3b4eabf84.tar.lz UXP-2d4aca6d0036937afadfb93359d31fe3b4eabf84.tar.xz UXP-2d4aca6d0036937afadfb93359d31fe3b4eabf84.zip | |
Merge branch 'master' into mailnews-work
Diffstat (limited to 'media/libcubeb/src/moz.build')
| -rw-r--r-- | media/libcubeb/src/moz.build | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/media/libcubeb/src/moz.build b/media/libcubeb/src/moz.build index b6d07126a..4b36b80fb 100644 --- a/media/libcubeb/src/moz.build +++ b/media/libcubeb/src/moz.build @@ -10,7 +10,11 @@ Library('cubeb') SOURCES += [ 'cubeb.c', - 'cubeb_panner.cpp' + 'cubeb_log.cpp', + 'cubeb_mixer.cpp', + 'cubeb_panner.cpp', + 'cubeb_strings.c', + 'cubeb_utils.cpp' ] if CONFIG['MOZ_ALSA']: @@ -39,7 +43,7 @@ if CONFIG['MOZ_JACK']: ] DEFINES['USE_JACK'] = True -if CONFIG['OS_ARCH'] == 'OpenBSD': +if CONFIG['MOZ_SNDIO']: SOURCES += [ 'cubeb_sndio.c', ] @@ -76,6 +80,7 @@ if CONFIG['OS_TARGET'] == 'WINNT': if CONFIG['OS_TARGET'] == 'Android': SOURCES += ['cubeb_opensl.c'] SOURCES += ['cubeb_resampler.cpp'] + SOURCES += ['cubeb-jni.cpp'] DEFINES['USE_OPENSL'] = True SOURCES += [ 'cubeb_audiotrack.c', @@ -85,6 +90,7 @@ if CONFIG['OS_TARGET'] == 'Android': FINAL_LIBRARY = 'gkmedias' CFLAGS += CONFIG['MOZ_ALSA_CFLAGS'] +CFLAGS += CONFIG['MOZ_JACK_CFLAGS'] CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS'] # We allow warnings for third-party code that can be updated from upstream. |