diff options
| author | jenn <jenn@lindenlab.com> | 2011-01-18 10:00:01 -0800 |
|---|---|---|
| committer | jenn <jenn@lindenlab.com> | 2011-01-18 10:00:01 -0800 |
| commit | 44bfcd662bf1bca7d4d60df393f66bd2c165db5a (patch) | |
| tree | 3016aa8fda20f296eb2cacf2acf2c5cf9b9036a1 | |
| parent | b82c6af32ae72d0d29ce312f710ae58136c238a2 (diff) | |
| parent | 3150fb0021222fe5e39dd45e82c183ccff8013f0 (diff) | |
Automated merge with https://bitbucket.org/mani_linden/viewer-autobuild
| -rw-r--r-- | autobuild.xml | 64 | ||||
| -rw-r--r-- | indra/cmake/OPENAL.cmake | 2 |
2 files changed, 62 insertions, 4 deletions
diff --git a/autobuild.xml b/autobuild.xml index 45dba8381d..dc4335bcb6 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -583,6 +583,30 @@ </map> </map> </map> + <key>google</key> + <map> + <key>name</key> + <string>google</string> + <key>platforms</key> + <map> + <key>linux</key> + <map> + <key>archive</key> + <map> + <key>hash</key> + <string>7d9d1b6d32ee273df164f7b7d5f29848</string> + <key>hash_algorithm</key> + <string>md5</string> + <key>url</key> + <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google-0.0.0-linux-20110114.tar.bz2</string> + </map> + <key>name</key> + <string>linux</string> + </map> + </map> + <key>version</key> + <string>0.0.0</string> + </map> <key>google-perftools</key> <map> <key>license_file</key> @@ -1187,6 +1211,32 @@ </map> </map> </map> + <key>openal_soft</key> + <map> + <key>license_file</key> + <string>LICENSES/OPENAL.txt</string> + <key>name</key> + <string>openal_soft</string> + <key>platforms</key> + <map> + <key>linux</key> + <map> + <key>archive</key> + <map> + <key>hash</key> + <string>fccdca18a950ac9363c6fb39118b80e1</string> + <key>hash_algorithm</key> + <string>md5</string> + <key>url</key> + <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-3ad86a1c-linux-20110114.tar.bz2</string> + </map> + <key>name</key> + <string>linux</string> + </map> + </map> + <key>version</key> + <string>3ad86a1c</string> + </map> <key>openjpeg</key> <map> <key>license_file</key> @@ -1614,7 +1664,7 @@ <map> <key>arguments</key> <array> - <string>..\indra</string> + <string>../indra</string> </array> <key>options</key> <array> @@ -1634,7 +1684,7 @@ <map> <key>arguments</key> <array> - <string>..\indra</string> + <string>../indra</string> </array> <key>options</key> <array> @@ -1653,7 +1703,7 @@ <map> <key>arguments</key> <array> - <string>..\indra</string> + <string>../indra</string> </array> <key>options</key> <array> @@ -1664,6 +1714,14 @@ <key>name</key> <string>Release</string> </map> + <key>default</key> + <map> + <key>build</key> + <map> + </map> + <key>name</key> + <string>default</string> + </map> </map> <key>name</key> <string>linux</string> diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake index d01c680ed1..ed483e5aea 100644 --- a/indra/cmake/OPENAL.cmake +++ b/indra/cmake/OPENAL.cmake @@ -15,7 +15,7 @@ if (OPENAL) pkg_check_modules(OPENAL_LIB REQUIRED openal) pkg_check_modules(FREEALUT_LIB REQUIRED freealut) else (STANDALONE) - use_prebuilt_binary(openal-soft) + use_prebuilt_binary(openal_soft) endif (STANDALONE) set(OPENAL_LIBRARIES openal |