1
0
Fork 0

Update to AeonWave version 3.0+

This commit is contained in:
Erik Hofman 2017-10-31 10:53:34 +01:00
parent 343fce4470
commit 5f828894df
2 changed files with 23 additions and 4 deletions

View file

@ -10,12 +10,13 @@
# #
# Created by Erik Hofman. # Created by Erik Hofman.
FIND_PATH(AAX_INCLUDE_DIR aax/aeonwave.hpp FIND_PATH(AAX_INCLUDE_DIR aax/aax.h
HINTS HINTS
$ENV{AAXDIR} $ENV{AAXDIR}
$ENV{ProgramFiles}/aax $ENV{ProgramFiles}/aax
$ENV{ProgramFiles}/AeonWave $ENV{ProgramFiles}/AeonWave
$ENV{ProgramFiles}/Adalin/AeonWave $ENV{ProgramFiles}/Adalin/AeonWave
${CMAKE_SOURCE_DIR}/aax
PATH_SUFFIXES include PATH_SUFFIXES include
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
@ -26,23 +27,35 @@ FIND_PATH(AAX_INCLUDE_DIR aax/aeonwave.hpp
) )
FIND_LIBRARY(AAX_LIBRARY FIND_LIBRARY(AAX_LIBRARY
NAMES AAX aax AAX32 libAAX32 NAMES AAX aax AAX32
HINTS HINTS
$ENV{AAXDIR} $ENV{AAXDIR}
$ENV{ProgramFiles}/AAX $ENV{ProgramFiles}/AAX
$ENV{ProgramFiles}/AeonWave $ENV{ProgramFiles}/AeonWave
$ENV{ProgramFiles}/Adalin/AeonWave $ENV{ProgramFiles}/Adalin/AeonWave
${CMAKE_BUILD_DIR}/aax
PATH_SUFFIXES bin lib lib/${CMAKE_LIBRARY_ARCHITECTURE} lib64 libs64 libs libs/Win32 libs/Win64 PATH_SUFFIXES bin lib lib/${CMAKE_LIBRARY_ARCHITECTURE} lib64 libs64 libs libs/Win32 libs/Win64
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /Library/Frameworks
/usr/local
/usr /usr
/opt /opt
/usr/local
) )
SET(AAX_FOUND "NO")
IF(AAX_LIBRARY AND AAX_INCLUDE_DIR) IF(AAX_LIBRARY AND AAX_INCLUDE_DIR)
SET(AAX_FOUND "YES") 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) ENDIF(AAX_LIBRARY AND AAX_INCLUDE_DIR)

View file

@ -173,6 +173,8 @@ target_link_libraries(fgfs
${PLATFORM_LIBS} ${PLATFORM_LIBS}
) )
if(ENABLE_FLITE) if(ENABLE_FLITE)
if(SYSTEM_HTS_ENGINE) if(SYSTEM_HTS_ENGINE)
target_link_libraries(fgfs flite_hts ${HTS_ENGINE_LIBRARIES}) target_link_libraries(fgfs flite_hts ${HTS_ENGINE_LIBRARIES})
@ -186,6 +188,10 @@ if (Qt5Core_FOUND)
set_property(TARGET fgfs PROPERTY AUTOMOC ON) set_property(TARGET fgfs PROPERTY AUTOMOC ON)
endif() endif()
if (USE_AEONWAVE)
target_link_libraries(fgfs ${AAX_LIBRARY})
endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
target_link_libraries(fgfs execinfo) target_link_libraries(fgfs execinfo)
endif() endif()