diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
| commit | fc61780b35af913801d72086456f493f63197da6 (patch) | |
| tree | f85891288a7bd988da9f0f15ae64e5c63f00d493 /media/kiss_fft/Makefile.in | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-2018.07.18.tar UXP-2018.07.18.tar.gz UXP-2018.07.18.tar.lz UXP-2018.07.18.tar.xz UXP-2018.07.18.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'media/kiss_fft/Makefile.in')
| -rw-r--r-- | media/kiss_fft/Makefile.in | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/media/kiss_fft/Makefile.in b/media/kiss_fft/Makefile.in new file mode 100644 index 000000000..eabc66309 --- /dev/null +++ b/media/kiss_fft/Makefile.in @@ -0,0 +1,14 @@ +# 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/. + +include $(topsrcdir)/config/rules.mk + +# We don't want OpenMP for KISS-FFT +ifeq ($(OS_ARCH),WINNT) + CFLAGS := $(filter-out -openmp,$(CFLAGS)) +endif + +ifdef GNU_CC + CFLAGS := $(filter-out -ftree-parallelize-loops -fopenmp,$(CFLAGS)) +endif |