Backed out changeset 8be5a62ce7f8 due to build issues. See Phoenixviewer JIRA INT-16
Arrehn
parent
be44394052
commit
52838540e3
|
|
@ -1,38 +1,64 @@
|
|||
# -*- cmake -*-
|
||||
|
||||
set(FMOD ON CACHE BOOL "Use FMOD sound library.")
|
||||
include(Linking)
|
||||
|
||||
if(INSTALL_PROPRIETARY)
|
||||
include(Prebuilt)
|
||||
use_prebuilt_binary(fmod)
|
||||
endif(INSTALL_PROPRIETARY)
|
||||
|
||||
find_library(FMOD_LIBRARY_RELEASE
|
||||
NAMES fmod fmodvc fmod-3.75
|
||||
PATHS
|
||||
${ARCH_PREBUILT_DIRS_RELEASE}
|
||||
)
|
||||
|
||||
find_library(FMOD_LIBRARY_DEBUG
|
||||
NAMES fmod fmodvc fmod-3.75
|
||||
PATHS
|
||||
${ARCH_PREBUILT_DIRS_DEBUG}
|
||||
)
|
||||
|
||||
if (FMOD_LIBRARY_RELEASE AND FMOD_LIBRARY_DEBUG)
|
||||
set(FMOD_LIBRARY
|
||||
debug ${FMOD_LIBRARY_DEBUG}
|
||||
optimized ${FMOD_LIBRARY_RELEASE})
|
||||
elseif (FMOD_LIBRARY_RELEASE)
|
||||
set(FMOD_LIBRARY ${FMOD_LIBRARY_RELEASE})
|
||||
endif (FMOD_LIBRARY_RELEASE AND FMOD_LIBRARY_DEBUG)
|
||||
|
||||
if (NOT FMOD_LIBRARY)
|
||||
set(FMOD_SDK_DIR CACHE PATH "Path to the FMOD SDK.")
|
||||
if (FMOD_SDK_DIR)
|
||||
find_library(FMOD_LIBRARY
|
||||
NAMES fmodvc fmod-3.75 fmod
|
||||
PATHS
|
||||
${FMOD_SDK_DIR}/api/lib
|
||||
${FMOD_SDK_DIR}/api
|
||||
${FMOD_SDK_DIR}/lib
|
||||
${FMOD_SDK_DIR}
|
||||
)
|
||||
endif (FMOD_SDK_DIR)
|
||||
endif (NOT FMOD_LIBRARY)
|
||||
|
||||
find_path(FMOD_INCLUDE_DIR fmod.h
|
||||
${LIBS_PREBUILT_DIR}/include
|
||||
${FMOD_SDK_DIR}/api/inc
|
||||
${FMOD_SDK_DIR}/inc
|
||||
${FMOD_SDK_DIR}
|
||||
)
|
||||
|
||||
if (FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
|
||||
set(FMOD ON CACHE BOOL "Use closed source FMOD sound library.")
|
||||
else (FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
|
||||
set(FMOD_LIBRARY "")
|
||||
set(FMOD_INCLUDE_DIR "")
|
||||
if (FMOD)
|
||||
message(STATUS "No support for FMOD audio (need to set FMOD_SDK_DIR?)")
|
||||
endif (FMOD)
|
||||
set(FMOD OFF CACHE BOOL "Use closed source FMOD sound library.")
|
||||
endif (FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
|
||||
|
||||
if (FMOD)
|
||||
if (STANDALONE)
|
||||
if (ARCH MATCHES "x86_64")
|
||||
MESSAGE(FATAL_ERROR "fmod not available for 64-bit. fmod can be disabled by passing -DFMOD=OFF to cmake configure step")
|
||||
endif (ARCH MATCHES "x86_64")
|
||||
set(FMOD_FIND_REQUIRED ON)
|
||||
include(FindFMOD)
|
||||
else (STANDALONE)
|
||||
include(Prebuilt)
|
||||
use_prebuilt_binary(fmod)
|
||||
|
||||
if (WINDOWS)
|
||||
set(FMOD_LIBRARY ${CMAKE_SOURCE_DIR}/../fmodapi375win/api/lib/fmodvc.lib)
|
||||
elseif (DARWIN)
|
||||
if (ARCH MATCHES "i386")
|
||||
set(FMOD_LIBRARY ${CMAKE_SOURCE_DIR}/../fmodapi375mac/api/lib/libfmodx86.a)
|
||||
else (ARCH MATCHES "i386")
|
||||
set(FMOD_LIBRARY ${CMAKE_SOURCE_DIR}/../fmodapi375mac/api/lib/libfmod.a)
|
||||
endif (ARCH MATCHES "i386")
|
||||
elseif (LINUX)
|
||||
set(FMOD_LIBRARY ${CMAKE_SOURCE_DIR}/../fmodapi375linux/api/libfmod-3.75.so)
|
||||
endif (WINDOWS)
|
||||
SET(FMOD_LIBRARIES ${FMOD_LIBRARY})
|
||||
|
||||
if (WINDOWS)
|
||||
set(FMOD_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/../fmodapi375win/api/inc)
|
||||
elseif (DARWIN)
|
||||
set(FMOD_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/../fmodapi375mac/api/inc)
|
||||
elseif (LINUX)
|
||||
set(FMOD_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/../fmodapi375linux/api/inc)
|
||||
endif (WINDOWS)
|
||||
|
||||
endif (STANDALONE)
|
||||
message(STATUS "Building with FMOD audio support")
|
||||
endif (FMOD)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -288,7 +288,7 @@ class WindowsManifest(ViewerManifest):
|
|||
|
||||
# Get fmod dll, continue if missing
|
||||
try:
|
||||
self.path("../../../../fmodapi375win/api/fmod.dll", "fmod.dll")
|
||||
self.path("fmod.dll")
|
||||
except:
|
||||
print "Skipping fmod.dll"
|
||||
|
||||
|
|
@ -983,7 +983,7 @@ class Linux_i686Manifest(LinuxManifest):
|
|||
print "Skipping libkdu.so - not found"
|
||||
pass
|
||||
try:
|
||||
self.path("../../../fmodapi375linux/api/libfmod-3.75.so", "libfmod-3.75.so")
|
||||
self.path("libfmod-3.75.so")
|
||||
pass
|
||||
except:
|
||||
print "Skipping libfmod-3.75.so - not found"
|
||||
|
|
|
|||
12
install.xml
12
install.xml
|
|
@ -366,23 +366,23 @@
|
|||
<key>darwin</key>
|
||||
<map>
|
||||
<key>md5sum</key>
|
||||
<string>69011586de5725de08c10611b1a0289a</string>
|
||||
<string>261bcd3387066cf0a1d46549400052b5</string>
|
||||
<key>url</key>
|
||||
<uri>http://www.fmod.org/files/fmod3/fmodapi375mac.zip</uri>
|
||||
<uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/fmod-3.75-darwin-20101007.tar.bz2</uri>
|
||||
</map>
|
||||
<key>linux</key>
|
||||
<map>
|
||||
<key>md5sum</key>
|
||||
<string>4fbd42fb8187c37ea454cc66186a1dfa</string>
|
||||
<string>8490d97430c12c2e1ac19ff80a8d4db4</string>
|
||||
<key>url</key>
|
||||
<uri>http://www.fmod.org/files/fmod3/fmodapi375linux.tar.gz</uri>
|
||||
<uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/fmod-3.75-linux-20101007.tar.bz2</uri>
|
||||
</map>
|
||||
<key>windows</key>
|
||||
<map>
|
||||
<key>md5sum</key>
|
||||
<string>4d28a685a92557c0dac06f9ab2567203</string>
|
||||
<string>bab1babcb01ff9849b7f072d352e1ecd</string>
|
||||
<key>url</key>
|
||||
<uri>http://www.fmod.org/files/fmod3/fmodapi375win.zip</uri>
|
||||
<uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/fmod-3.75-windows-20101007.tar.bz2</uri>
|
||||
</map>
|
||||
</map>
|
||||
</map>
|
||||
|
|
|
|||
|
|
@ -83,7 +83,6 @@ except ImportError:
|
|||
|
||||
from indra.base import llsd
|
||||
from indra.util import helpformatter
|
||||
from indra.util import zipfile
|
||||
|
||||
class InstallFile(object):
|
||||
"This is just a handy way to throw around details on a file in memory."
|
||||
|
|
@ -549,47 +548,28 @@ windows/i686/vs/2003 -- specify a windows visual studio 2003 package"""
|
|||
|
||||
def _install(self, to_install, install_dir):
|
||||
for ifile in to_install:
|
||||
if ifile.filename.endswith("zip"):
|
||||
zip = zipfile.ZipFile(ifile.filename, 'r')
|
||||
print "Extracting",ifile.filename,"to",install_dir
|
||||
if not self._dryrun:
|
||||
zip.extractall(install_dir)
|
||||
if ifile.pkgname in self._installed:
|
||||
self._installed[ifile.pkgname].add_files(
|
||||
ifile.url,
|
||||
zip.namelist())
|
||||
self._installed[ifile.pkgname].set_md5sum(
|
||||
ifile.url,
|
||||
ifile.md5sum)
|
||||
else:
|
||||
# *HACK: this understands the installed package syntax.
|
||||
definition = { ifile.url :
|
||||
{'files': zip.namelist(),
|
||||
'md5sum' : ifile.md5sum } }
|
||||
self._installed[ifile.pkgname] = InstalledPackage(definition)
|
||||
tar = tarfile.open(ifile.filename, 'r')
|
||||
print "Extracting",ifile.filename,"to",install_dir
|
||||
if not self._dryrun:
|
||||
# *NOTE: try to call extractall, which first appears
|
||||
# in python 2.5. Phoenix 2008-01-28
|
||||
try:
|
||||
tar.extractall(path=install_dir)
|
||||
except AttributeError:
|
||||
_extractall(tar, path=install_dir)
|
||||
if ifile.pkgname in self._installed:
|
||||
self._installed[ifile.pkgname].add_files(
|
||||
ifile.url,
|
||||
tar.getnames())
|
||||
self._installed[ifile.pkgname].set_md5sum(
|
||||
ifile.url,
|
||||
ifile.md5sum)
|
||||
else:
|
||||
tar = tarfile.open(ifile.filename, 'r')
|
||||
print "Extracting",ifile.filename,"to",install_dir
|
||||
if not self._dryrun:
|
||||
# *NOTE: try to call extractall, which first appears
|
||||
# in python 2.5. Phoenix 2008-01-28
|
||||
try:
|
||||
tar.extractall(path=install_dir)
|
||||
except AttributeError:
|
||||
_extractall(tar, path=install_dir)
|
||||
if ifile.pkgname in self._installed:
|
||||
self._installed[ifile.pkgname].add_files(
|
||||
ifile.url,
|
||||
tar.getnames())
|
||||
self._installed[ifile.pkgname].set_md5sum(
|
||||
ifile.url,
|
||||
ifile.md5sum)
|
||||
else:
|
||||
# *HACK: this understands the installed package syntax.
|
||||
definition = { ifile.url :
|
||||
{'files': tar.getnames(),
|
||||
'md5sum' : ifile.md5sum } }
|
||||
self._installed[ifile.pkgname] = InstalledPackage(definition)
|
||||
# *HACK: this understands the installed package syntax.
|
||||
definition = { ifile.url :
|
||||
{'files': tar.getnames(),
|
||||
'md5sum' : ifile.md5sum } }
|
||||
self._installed[ifile.pkgname] = InstalledPackage(definition)
|
||||
self._installed_changed = True
|
||||
|
||||
def install(self, installables, platform, install_dir, cache_dir):
|
||||
|
|
|
|||
Loading…
Reference in New Issue