From 5f828894dff38b93416930219adbb685ac8d9509 Mon Sep 17 00:00:00 2001
From: Erik Hofman <erik@ehofman.com>
Date: Tue, 31 Oct 2017 10:53:34 +0100
Subject: [PATCH] Update to AeonWave version 3.0+

---
 CMakeModules/FindAAX.cmake | 21 +++++++++++++++++----
 src/Main/CMakeLists.txt    |  6 ++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/CMakeModules/FindAAX.cmake b/CMakeModules/FindAAX.cmake
index d9a5e00bd..4e0bfdcd2 100644
--- a/CMakeModules/FindAAX.cmake
+++ b/CMakeModules/FindAAX.cmake
@@ -10,12 +10,13 @@
 #
 # Created by Erik Hofman.
 
-FIND_PATH(AAX_INCLUDE_DIR aax/aeonwave.hpp
+FIND_PATH(AAX_INCLUDE_DIR aax/aax.h
   HINTS
   $ENV{AAXDIR}
   $ENV{ProgramFiles}/aax
   $ENV{ProgramFiles}/AeonWave
   $ENV{ProgramFiles}/Adalin/AeonWave
+  ${CMAKE_SOURCE_DIR}/aax
   PATH_SUFFIXES include
   PATHS
   ~/Library/Frameworks
@@ -26,23 +27,35 @@ FIND_PATH(AAX_INCLUDE_DIR aax/aeonwave.hpp
 )
 
 FIND_LIBRARY(AAX_LIBRARY 
-  NAMES AAX aax AAX32 libAAX32
+  NAMES AAX aax AAX32
   HINTS
   $ENV{AAXDIR}
   $ENV{ProgramFiles}/AAX
   $ENV{ProgramFiles}/AeonWave
   $ENV{ProgramFiles}/Adalin/AeonWave
+  ${CMAKE_BUILD_DIR}/aax
   PATH_SUFFIXES bin lib lib/${CMAKE_LIBRARY_ARCHITECTURE} lib64 libs64 libs libs/Win32 libs/Win64
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks
+  /usr/local
   /usr
   /opt
-  /usr/local
 )
 
-SET(AAX_FOUND "NO")
 IF(AAX_LIBRARY AND AAX_INCLUDE_DIR)
   SET(AAX_FOUND "YES")
+ELSE(AAX_LIBRARY AND AAX_INCLUDE_DIR)
+  IF(NOT AAX_INCLUDE_DIR)
+    MESSAGE(FATAL_ERROR "Unable to find the AAX library development files.")
+    SET(AAX_FOUND "NO")
+  ENDIF(NOT AAX_INCLUDE_DIR)
+  IF(NOT AAX_LIBRARY)
+    IF(SINGLE_PACKAGE)
+      SET(AAX_LIBRARY "${aax_BUILD_DIR}/aax/AAX32.dll")
+      SET(AAX_FOUND "YES")
+    ELSE(SINGLE_PACKAGE)
+    ENDIF(SINGLE_PACKAGE)
+  ENDIF(NOT AAX_LIBRARY)
 ENDIF(AAX_LIBRARY AND AAX_INCLUDE_DIR)
 
diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
index 8ae90d2cc..cd58c46bf 100644
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -173,6 +173,8 @@ target_link_libraries(fgfs
 	${PLATFORM_LIBS}
 )
 
+
+
 if(ENABLE_FLITE)
     if(SYSTEM_HTS_ENGINE)
         target_link_libraries(fgfs flite_hts ${HTS_ENGINE_LIBRARIES})
@@ -186,6 +188,10 @@ if (Qt5Core_FOUND)
     set_property(TARGET fgfs PROPERTY AUTOMOC ON)
 endif()
 
+if (USE_AEONWAVE)
+   target_link_libraries(fgfs ${AAX_LIBRARY})
+endif()
+
 if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
     target_link_libraries(fgfs execinfo)
 endif()