From 8b988e861370bd500e79e330f3cda057b25f5a87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismael=20G=C3=B3mez-Miguelez?= <gomezi@tcd.ie>
Date: Tue, 10 Nov 2015 11:55:32 +0100
Subject: [PATCH 1/2] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e2e44a384..d1d1eb5f3 100644
--- a/README.md
+++ b/README.md
@@ -14,8 +14,8 @@ Current Features:
  * All DL channels/signals are supported for UE and eNodeB side: PSS, SSS, PBCH, PCFICH, PHICH, PDCCH, PDSCH
  * All UL channels/signals are supported for UE side: PRACH, PUSCH, PUCCH, SRS 
  * All MAC for UE side is supported
- * Frequency-based ZF and MMSE equalizer
- * Highly optimized Turbo Decoder available for SSE (+100 Mbps) and standard C (+25 Mbps)
+ * Frequency-based ZF and MMSE
+ * Highly optimized Turbo Decoder available in Intel SSE4.1/AVX (+100 Mbps) and standard C (+25 Mbps)
  * MATLAB and OCTAVE MEX library generation for many components
  * UE receiver tested and verified with Amarisoft LTE 100 eNodeB and commercial LTE networks (Telefonica Spain, Three.ie and Eircom in Ireland)
 

From 3bfd54be3bb044a7e9254cabb4d425f3e68468ef Mon Sep 17 00:00:00 2001
From: Paul Sutton <suttonpd@gmail.com>
Date: Tue, 10 Nov 2015 11:26:30 +0000
Subject: [PATCH 2/2] Fixes for FindVolk so that includes are found correctly

---
 cmake/modules/FindVolk.cmake | 10 +++++-----
 srslte/lib/CMakeLists.txt    |  5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/cmake/modules/FindVolk.cmake b/cmake/modules/FindVolk.cmake
index 07fb660cd..c36f78557 100644
--- a/cmake/modules/FindVolk.cmake
+++ b/cmake/modules/FindVolk.cmake
@@ -3,12 +3,12 @@ PKG_CHECK_MODULES(PC_VOLK volk QUIET)
 
 FIND_PATH(
     VOLK_INCLUDE_DIRS
-    NAMES volk.h 
-    HINTS $ENV{VOLK_DIR}/include/volk
-          ${CMAKE_INSTALL_PREFIX}/include/volk
+    NAMES volk/volk.h
+    HINTS $ENV{VOLK_DIR}/include
+          ${CMAKE_INSTALL_PREFIX}/include
           ${PC_VOLK_INCLUDE_DIR}
-    PATHS /usr/local/include/volk
-          /usr/include/volk
+    PATHS /usr/local/include
+          /usr/include
 )
 
 FIND_LIBRARY(
diff --git a/srslte/lib/CMakeLists.txt b/srslte/lib/CMakeLists.txt
index af333c2f6..89269b86d 100644
--- a/srslte/lib/CMakeLists.txt
+++ b/srslte/lib/CMakeLists.txt
@@ -38,6 +38,11 @@ ELSE(${DISABLE_VOLK})
   FIND_PACKAGE(Volk)
 ENDIF(${DISABLE_VOLK})
 
+IF(VOLK_FOUND)
+  INCLUDE_DIRECTORIES(${VOLK_INCLUDE_DIRS})
+  LINK_DIRECTORIES(${VOLK_LIBRARY_DIRS})
+ENDIF(VOLK_FOUND)
+
 IF(FFTW3F_FOUND)
   INCLUDE_DIRECTORIES(${FFTW3F_INCLUDE_DIRS})
   LINK_DIRECTORIES(${FFTW3F_LIBRARY_DIRS})