Merge fix for copying Linux Vivox files

master
Nat Goodspeed 2015-01-21 08:29:21 -05:00
commit b349bcf2b6
2 changed files with 9 additions and 9 deletions

View File

@ -233,11 +233,11 @@ elseif(LINUX)
set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
set(vivox_files
libsndfile.dylib
libortp.dylib
libvivoxoal.dylib
libvivoxplatform.dylib
libvivoxsdk.dylib
libsndfile.so.1
libortp.so
libvivoxoal.so.1
libvivoxplatform.so
libvivoxsdk.so
SLVoice
# ca-bundle.crt #No cert for linux. It is actually still 3.2SDK.
)

View File

@ -1127,11 +1127,11 @@ class Linux_i686_Manifest(LinuxManifest):
self.path("SLVoice")
self.end_prefix()
if self.prefix(src="../packages/lib/release", dst="lib"):
self.path("libortp.dylib")
self.path("libsndfile.dylib")
self.path("libortp.so")
self.path("libsndfile.so.1")
#self.path("libvivoxoal.so.1") # no - we'll re-use the viewer's own OpenAL lib
self.path("libvivoxsdk.dylib")
self.path("libvivoxplatform.dylib")
self.path("libvivoxsdk.so")
self.path("libvivoxplatform.so")
self.end_prefix("lib")
# plugin runtime