Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 08:49:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #11780 from kencooke/audio-codec-update

Browse source 
Audio codec update for all platforms (includes Android)
This commit is contained in:
Ken Cooke 2017-11-11 11:33:33 -08:00 committed by GitHub
commit 89dbbb44ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
cmake/externals/hifiAudioCodec/CMakeLists.txt vendored
View file

@ -5,43 +5,41 @@ set(EXTERNAL_NAME hifiAudioCodec)
string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER) string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
if (NOT ANDROID) if (WIN32)
set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-win-2.0.zip)
if (WIN32 OR APPLE) set(DOWNLOAD_MD5 9199d4dbd6b16bed736b235efe980e67)
ExternalProject_Add( elseif (APPLE)
${EXTERNAL_NAME} set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-mac-2.0.zip)
URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-1.zip set(DOWNLOAD_MD5 21649881e7d5dc94f922179be96f76ba)
URL_MD5 23ec3fe51eaa155ea159a4971856fc13 elseif (ANDROID)
CONFIGURE_COMMAND "" set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-android-2.0.zip)
BUILD_COMMAND "" set(DOWNLOAD_MD5 aef2a852600d498d58aa586668191683)
INSTALL_COMMAND "" elseif (UNIX)
LOG_DOWNLOAD 1 set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-linux-2.0.zip)
) set(DOWNLOAD_MD5 67fb7755f9bcafb98a9fceea53bc7481)
else () else()
ExternalProject_Add( return()
${EXTERNAL_NAME} endif()
URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-linux.zip
URL_MD5 7d37914a18aa4de971d2f45dd3043bde ExternalProject_Add(
CONFIGURE_COMMAND "" ${EXTERNAL_NAME}
BUILD_COMMAND "" URL ${DOWNLOAD_URL}
INSTALL_COMMAND "" URL_MD5 ${DOWNLOAD_MD5}
LOG_DOWNLOAD 1 CONFIGURE_COMMAND ""
) BUILD_COMMAND ""
endif() INSTALL_COMMAND ""
LOG_DOWNLOAD 1
# Hide this external target (for ide users) )
set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
# Hide this external target (for ide users)
ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR) set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/include CACHE TYPE INTERNAL) ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
if (WIN32) set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/include CACHE TYPE INTERNAL)
set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/audio.lib CACHE TYPE INTERNAL)
elseif(APPLE) if (WIN32)
set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/libaudio.a CACHE TYPE INTERNAL) set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/audio.lib CACHE TYPE INTERNAL)
elseif(NOT ANDROID) else()
set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/libaudio.a CACHE TYPE INTERNAL) set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/libaudio.a CACHE TYPE INTERNAL)
endif()
endif() endif()