From b60b9bb312a4528b620dc384cdfd9b5101f5d117 Mon Sep 17 00:00:00 2001
From: Ken Cooke <ken@highfidelity.io>
Date: Mon, 6 Jun 2016 14:54:15 -0700
Subject: [PATCH] compiler fixes for GCC/clang

---
 cmake/macros/SetupHifiLibrary.cmake                    | 10 ++++++++++
 .../{avx/AudioSRC_avx.cpp => avx2/AudioSRC_avx2.cpp}   |  6 +++---
 2 files changed, 13 insertions(+), 3 deletions(-)
 rename libraries/audio/src/{avx/AudioSRC_avx.cpp => avx2/AudioSRC_avx2.cpp} (98%)

diff --git a/cmake/macros/SetupHifiLibrary.cmake b/cmake/macros/SetupHifiLibrary.cmake
index 628f65b278..26c769c6e6 100644
--- a/cmake/macros/SetupHifiLibrary.cmake
+++ b/cmake/macros/SetupHifiLibrary.cmake
@@ -24,6 +24,16 @@ macro(SETUP_HIFI_LIBRARY)
       set_source_files_properties(${SRC} PROPERTIES COMPILE_FLAGS -mavx)
     endif()
   endforeach()
+
+  # add compiler flags to AVX2 source files
+  file(GLOB_RECURSE AVX2_SRCS "src/avx2/*.cpp" "src/avx2/*.c")
+  foreach(SRC ${AVX2_SRCS})
+    if (WIN32)
+      set_source_files_properties(${SRC} PROPERTIES COMPILE_FLAGS /arch:AVX2)
+    elseif (APPLE OR UNIX)
+      set_source_files_properties(${SRC} PROPERTIES COMPILE_FLAGS "-mavx2 -mfma")
+    endif()
+  endforeach()
     
   setup_memory_debugger()
 
diff --git a/libraries/audio/src/avx/AudioSRC_avx.cpp b/libraries/audio/src/avx2/AudioSRC_avx2.cpp
similarity index 98%
rename from libraries/audio/src/avx/AudioSRC_avx.cpp
rename to libraries/audio/src/avx2/AudioSRC_avx2.cpp
index dcc56b94ad..e634554bfb 100644
--- a/libraries/audio/src/avx/AudioSRC_avx.cpp
+++ b/libraries/audio/src/avx2/AudioSRC_avx2.cpp
@@ -1,5 +1,5 @@
 //
-//  AudioSRC_avx.cpp
+//  AudioSRC_avx2.cpp
 //  libraries/audio/src
 //
 //  Created by Ken Cooke on 6/5/16.
@@ -16,8 +16,8 @@
 
 #include "../AudioSRC.h"
 
-#ifndef __AVX__
-#error Must be compiled with /arch:AVX or -mavx.
+#ifndef __AVX2__
+#error Must be compiled with /arch:AVX2 or -mavx2 -mfma.
 #endif
 
 // high/low part of int64_t