FIRE-21917: Fix linking against wrong FmodEx library on Linux64, patch by Lord Drakeo

Fri, 08 Dec 2017 12:12:57 +0100

author
Ansariel
date
Fri, 08 Dec 2017 12:12:57 +0100
changeset 53559
40f9e684cdc7
parent 53558
c68dfe8d1359
child 53560
2197c9ec4358

FIRE-21917: Fix linking against wrong FmodEx library on Linux64, patch by Lord Drakeo

indra/cmake/Copy3rdPartyLibs.cmake file | annotate | diff | revisions
     1.1 --- a/indra/cmake/Copy3rdPartyLibs.cmake	Fri Dec 08 11:52:14 2017 +0100
     1.2 +++ b/indra/cmake/Copy3rdPartyLibs.cmake	Fri Dec 08 12:12:57 2017 +0100
     1.3 @@ -258,9 +258,18 @@
     1.4        set(release_files ${release_files} "libtcmalloc_minimal.so")
     1.5      endif (USE_TCMALLOC)
     1.6  
     1.7 +    #if (FMODEX)
     1.8 +    #  set(debug_files ${debug_files} "libfmodexL.so")
     1.9 +    #  set(release_files ${release_files} "libfmodex.so")
    1.10 +    #endif (FMODEX)
    1.11      if (FMODEX)
    1.12 -      set(debug_files ${debug_files} "libfmodexL.so")
    1.13 -      set(release_files ${release_files} "libfmodex.so")
    1.14 +      if( NOT ND_BUILD64BIT_ARCH )
    1.15 +        set(debug_files ${debug_files} "libfmodexL.so")
    1.16 +        set(release_files ${release_files} "libfmodex.so")
    1.17 +      else( NOT ND_BUILD64BIT_ARCH )
    1.18 +        set(debug_files ${debug_files} "libfmodexL64.so")
    1.19 +        set(release_files ${release_files} "libfmodex64.so")
    1.20 +      endif( NOT ND_BUILD64BIT_ARCH )
    1.21      endif (FMODEX)
    1.22  
    1.23  else(WINDOWS)

mercurial