Bug 855990 - Part 3: Integrate Kiss FFT with the build system; r=glandium
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 02 Apr 2013 15:01:26 -0400
changeset 126976 93e66438fb718b7cb4ac18e18babc85445791b8b
parent 126975 3f7d9ca669a8dc85a101f1e61b6ce4b6d15e6a9f
child 126977 a0c0b77f3022958e3bc9b36b52b39a3aef35bf41
push id24499
push userryanvm@gmail.com
push dateWed, 03 Apr 2013 02:25:10 +0000
treeherdermozilla-central@97cfc16ba5dc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs855990
milestone23.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 855990 - Part 3: Integrate Kiss FFT with the build system; r=glandium
media/kiss_fft/Makefile.in
media/kiss_fft/moz.build
toolkit/library/Makefile.in
toolkit/toolkit.mozbuild
new file mode 100644
--- /dev/null
+++ b/media/kiss_fft/Makefile.in
@@ -0,0 +1,23 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DEPTH = @DEPTH@
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+LIBRARY_NAME = kiss_fft
+ifeq (WINNT,$(OS_TARGET))
+VISIBILITY_FLAGS =
+endif
+EXPORTS_NAMESPACES = kiss_fft
+
+EXPORTS_kiss_fft = kiss_fft.h kiss_fftr.h
+
+CSRCS = kiss_fft.c kiss_fftr.c
+
+include $(topsrcdir)/config/rules.mk
+
new file mode 100644
--- /dev/null
+++ b/media/kiss_fft/moz.build
@@ -0,0 +1,7 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+MODULE = 'kiss_fft'
+
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -32,16 +32,17 @@ ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
 CPPSRCS += dlldeps-xul.cpp
 endif
 
 ifeq ($(OS_ARCH),OS2)
 CPPSRCS += dlldeps-xul.cpp
 endif
 
 SHARED_LIBRARY_LIBS += \
+  $(DEPTH)/media/kiss_fft/$(LIB_PREFIX)kiss_fft.$(LIB_SUFFIX) \
   $(DEPTH)/toolkit/components/osfile/$(LIB_PREFIX)osfile_s.$(LIB_SUFFIX) \
   $(DEPTH)/toolkit/xre/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX) \
   $(NULL)
 
 SHARED_LIBRARY_LIBS += \
   $(foreach component,$(COMPONENT_LIBS),$(DEPTH)/staticlib/components/$(LIB_PREFIX)$(component).$(LIB_SUFFIX)) \
   $(foreach lib,$(STATIC_LIBS),$(DEPTH)/staticlib/$(LIB_PREFIX)$(lib).$(LIB_SUFFIX)) \
   $(NULL)
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -119,16 +119,18 @@ if CONFIG['MOZ_OMX_PLUGIN']:
         'media/omx-plugin/hc',
         'media/omx-plugin/sony',
         'media/omx-plugin/jb-htc',
     ])
 
 if not CONFIG['MOZ_NATIVE_PNG']:
     add_tier_dir('platform', 'media/libpng')
 
+add_tier_dir('platform', 'media/kiss_fft')
+
 if CONFIG['ENABLE_TESTS']:
     add_tier_dir('platform', 'testing/specialpowers')
 
 if CONFIG['MOZ_ENABLE_GTEST']:
     add_tier_dir('platform', 'testing/gtest')
 
 add_tier_dir('platform', [
     'uriloader',