OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-19 19:59:09 +00:00
Code Releases Activity

Make audio work

Browse Source 
Includes some reorganization and cleanup
This commit is contained in:
Florian Meißner
2014-10-26 22:54:37 +01:00
parent 9de5c4db54
commit 7cd8f51eb4
11 changed files with 214 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmake/FindOpus.cmake
View File

@ -1,8 +1,7 @@
if(Opus_INCLUDE_DIR AND Opus_LIBRARY)
set(Opus_FIND_QUIETLY TRUE)
set(Opus_FIND_QUIETLY TRUE)
endif()
find_path(Opus_INCLUDE_DIR opus.h
/usr/local/include
/usr/include
@ -20,11 +19,11 @@ find_library(Silk_LIBRARY NAMES silk_common
set(Opus_LIBRARIES
${Opus_LIBRARY}
${Celt_LIBRARY}
${Silk_LIBRARY})
${Silk_LIBRARY}
)
if(Opus_INCLUDE_DIR AND Opus_LIBRARY)
set(Opus_FOUND TRUE)
set(Opus_FOUND TRUE)
endif()
if (Opus_FOUND)
@ -35,4 +34,4 @@ else()
if(Opus_FIND_REQUIRED)
message(FATAL_ERROR "Could not find libopus")
endif()
endif()
endif()

8
cmake/FindVPX.cmake
View File

@ -7,12 +7,10 @@ find_path(VPX_INCLUDE_DIR vpx/vp8.h
/usr/include
)
find_library(VPX_LIBRARY NAMES vpxmt vpx
find_library(VPX_LIBRARY NAMES vpxmt vpxmd vpx
PATHS /usr/local/lib /usr/lib
)
# If everything has been found, we have movie support!
if (VPX_INCLUDE_DIR AND VPX_LIBRARY)
set(VPX_AVAILABLE TRUE)
add_definitions(-DVPX_AVAILABLE)
if(VPX_INCLUDE_DIR AND VPX_LIBRARY)
set(VPX_FOUND TRUE)
endif()