| Revision | 862b1441fafcf675cdb69204727cd1e9b919d532 (tree) |
|---|---|
| Zeit | 2016-02-20 19:38:29 |
| Autor | Edoardo Prezioso <edo88@emai...> |
| Commiter | Edoardo Prezioso |
[fmod] Improve the checks for fmod 4.44.
- The FMOD 4.44 linux package contains both 32 and 64-bit versions, with the folder name without the '64' suffix for 64-bit.
- Add minor version '61' so that the latest FMOD package (at the time of this commit) can be detected and compiled successfully.
src/CMakeLists.txt (diff)| @@ -53,7 +53,7 @@ | ||
| 53 | 53 | # a system-wide version. |
| 54 | 54 | |
| 55 | 55 | # Construct version numbers for searching for the FMOD library on Linux. |
| 56 | -set( MINOR_VERSIONS "50" "49" "48" "47" "46" "45" "44" "43" "42" "41" | |
| 56 | +set( MINOR_VERSIONS "61" "50" "49" "48" "47" "46" "45" "44" "43" "42" "41" | |
| 57 | 57 | "40" "39" "38" "37" "36" "35" "34" "33" "32" "31" "30" "29" "28" |
| 58 | 58 | "27" "26" "25" "24" "23" "22" "21" "20" "21" "19" "18" "17" "16" |
| 59 | 59 | "15" "14" "13" "12" "11" "10" "09" "08" "07" "06" "05" "04" "03" |
| @@ -77,7 +77,12 @@ | ||
| 77 | 77 | foreach( majver ${MAJOR_VERSIONS} ) |
| 78 | 78 | foreach( minver ${MINOR_VERSIONS} ) |
| 79 | 79 | set( FMOD_VERSIONS ${FMOD_VERSIONS} "fmodex${X64}-4.${majver}.${minver}" ) |
| 80 | - set( FMOD_DIR_VERSIONS ${FMOD_DIR_VERSIONS} "${CMAKE_HOME_DIRECTORY}/fmodapi4${majver}${minver}linux${X64}" ) | |
| 80 | + # FMOD Ex version 4.44 unified 32-bit and 64-bit linux packages into one. | |
| 81 | + if( NOT majver EQUAL "44" ) | |
| 82 | + set( FMOD_DIR_VERSIONS ${FMOD_DIR_VERSIONS} "${CMAKE_HOME_DIRECTORY}/fmodapi4${majver}${minver}linux${X64}" ) | |
| 83 | + else() | |
| 84 | + set( FMOD_DIR_VERSIONS ${FMOD_DIR_VERSIONS} "${CMAKE_HOME_DIRECTORY}/fmodapi4${majver}${minver}linux" ) | |
| 85 | + endif() | |
| 81 | 86 | endforeach( minver ${MINOR_VERSIONS} ) |
| 82 | 87 | foreach( dir ${FMOD_DIR_VERSIONS} ) |
| 83 | 88 | set( FMOD_LOCAL_INC_DIRS ${FMOD_LOCAL_INC_DIRS} "${dir}/api/inc" ) |
Fork