Skip to content
Snippets Groups Projects
Commit 44bfcd66 authored by jenn's avatar jenn
Browse files

Automated merge with https://bitbucket.org/mani_linden/viewer-autobuild

parents b82c6af3 3150fb00
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
autobuild.xml
+ 61
− 3
View file @ 44bfcd66
...@@ -583,6 +583,30 @@ ...@@ -583,6 +583,30 @@
</map> </map>
</map> </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> <key>google-perftools</key>
<map> <map>
<key>license_file</key> <key>license_file</key>
...@@ -1187,6 +1211,32 @@ ...@@ -1187,6 +1211,32 @@
</map> </map>
</map> </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> <key>openjpeg</key>
<map> <map>
<key>license_file</key> <key>license_file</key>
...@@ -1614,7 +1664,7 @@ ...@@ -1614,7 +1664,7 @@
<map> <map>
<key>arguments</key> <key>arguments</key>
<array> <array>
<string>..\indra</string> <string>../indra</string>
</array> </array>
<key>options</key> <key>options</key>
<array> <array>
...@@ -1634,7 +1684,7 @@ ...@@ -1634,7 +1684,7 @@
<map> <map>
<key>arguments</key> <key>arguments</key>
<array> <array>
<string>..\indra</string> <string>../indra</string>
</array> </array>
<key>options</key> <key>options</key>
<array> <array>
...@@ -1653,7 +1703,7 @@ ...@@ -1653,7 +1703,7 @@
<map> <map>
<key>arguments</key> <key>arguments</key>
<array> <array>
<string>..\indra</string> <string>../indra</string>
</array> </array>
<key>options</key> <key>options</key>
<array> <array>
...@@ -1664,6 +1714,14 @@ ...@@ -1664,6 +1714,14 @@
<key>name</key> <key>name</key>
<string>Release</string> <string>Release</string>
</map> </map>
<key>default</key>
<map>
<key>build</key>
<map>
</map>
<key>name</key>
<string>default</string>
</map>
</map> </map>
<key>name</key> <key>name</key>
<string>linux</string> <string>linux</string>
......
indra/cmake/OPENAL.cmake
+ 1
− 1
View file @ 44bfcd66
...@@ -15,7 +15,7 @@ if (OPENAL) ...@@ -15,7 +15,7 @@ if (OPENAL)
pkg_check_modules(OPENAL_LIB REQUIRED openal) pkg_check_modules(OPENAL_LIB REQUIRED openal)
pkg_check_modules(FREEALUT_LIB REQUIRED freealut) pkg_check_modules(FREEALUT_LIB REQUIRED freealut)
else (STANDALONE) else (STANDALONE)
use_prebuilt_binary(openal-soft) use_prebuilt_binary(openal_soft)
endif (STANDALONE) endif (STANDALONE)
set(OPENAL_LIBRARIES set(OPENAL_LIBRARIES
openal openal
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment