From 6dba2e1ba248291f761e072f7176ef5b32ba5216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20St=C3=B6neberg?= Date: Wed, 12 Mar 2014 16:57:23 +0000 Subject: [PATCH] fixed clang -Wunused-const-variable warning in libflac (nw) --- src/lib/lib.mak | 5 ----- src/lib/libflac/libFLAC/cpu.c | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/lib/lib.mak b/src/lib/lib.mak index be5ef79a92d..ad41a03718e 100644 --- a/src/lib/lib.mak +++ b/src/lib/lib.mak @@ -355,11 +355,6 @@ ifdef MSVC_BUILD else FLACOPTS += -DVERSION=\"1.2.1\" endif -ifneq (,$(findstring clang,$(CC))) -ifneq (,$(findstring emcc,$(CC))) - FLACOPTS += -Wno-unused-const-variable -endif -endif LIBFLACOBJS = \ $(LIBOBJ)/libflac/bitmath.o \ diff --git a/src/lib/libflac/libFLAC/cpu.c b/src/lib/libflac/libFLAC/cpu.c index 60b73bff143..8e97d45e493 100644 --- a/src/lib/libflac/libFLAC/cpu.c +++ b/src/lib/libflac/libFLAC/cpu.c @@ -86,6 +86,7 @@ static void sigill_handler (int sig) /* how to get sysctlbyname()? */ #endif +#if defined(FLAC__CPU_IA32) && !defined(FLAC__NO_ASM) && defined (FLAC__HAS_NASM) /* these are flags in EDX of CPUID AX=00000001 */ static const unsigned FLAC__CPUINFO_IA32_CPUID_CMOV = 0x00008000; static const unsigned FLAC__CPUINFO_IA32_CPUID_MMX = 0x00800000; @@ -95,10 +96,13 @@ static const unsigned FLAC__CPUINFO_IA32_CPUID_SSE2 = 0x04000000; /* these are flags in ECX of CPUID AX=00000001 */ static const unsigned FLAC__CPUINFO_IA32_CPUID_SSE3 = 0x00000001; static const unsigned FLAC__CPUINFO_IA32_CPUID_SSSE3 = 0x00000200; +#ifdef FLAC__USE_3DNOW /* these are flags in EDX of CPUID AX=80000001 */ static const unsigned FLAC__CPUINFO_IA32_CPUID_EXTENDED_AMD_3DNOW = 0x80000000; static const unsigned FLAC__CPUINFO_IA32_CPUID_EXTENDED_AMD_EXT3DNOW = 0x40000000; static const unsigned FLAC__CPUINFO_IA32_CPUID_EXTENDED_AMD_EXTMMX = 0x00400000; +#endif +#endif /*