Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated APR and Zlib prebuilts.

Browse Source
This commit is contained in:
Drake Arconis
2012-02-19 15:59:47 -05:00
parent 925c42294f
commit a4363de59e
3 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/cmake/APR.cmake
View File

@@ -29,12 +29,12 @@ else (STANDALONE)
) )
elseif (DARWIN) elseif (DARWIN)
set(APR_LIBRARIES set(APR_LIBRARIES
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.0.3.7.dylib debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.0.dylib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.0.3.7.dylib optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.0.dylib
) )
set(APRUTIL_LIBRARIES set(APRUTIL_LIBRARIES
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.0.3.8.dylib debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.0.dylib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.0.3.8.dylib optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.0.dylib
) )
set(APRICONV_LIBRARIES iconv) set(APRICONV_LIBRARIES iconv)
else (WINDOWS) else (WINDOWS)

8
indra/newview/viewer_manifest.py
View File

@@ -514,8 +514,8 @@ class DarwinManifest(ViewerManifest):
libfile = "lib%s.dylib" libfile = "lib%s.dylib"
libdir = "../../libraries/universal-darwin/lib_release" libdir = "../../libraries/universal-darwin/lib_release"
for libfile in ("libapr-1.0.3.7.dylib", for libfile in ("libapr-1.0.dylib",
"libaprutil-1.0.3.8.dylib", "libaprutil-1.0.dylib",
"libexpat.0.5.0.dylib"): "libexpat.0.5.0.dylib"):
self.path(os.path.join(libdir, libfile), libfile) self.path(os.path.join(libdir, libfile), libfile)
@@ -541,8 +541,8 @@ class DarwinManifest(ViewerManifest):
mac_crash_logger_res_path = self.dst_path_of("mac-crash-logger.app/Contents/Resources") mac_crash_logger_res_path = self.dst_path_of("mac-crash-logger.app/Contents/Resources")
slplugin_res_path = self.dst_path_of("SLPlugin.app/Contents/Resources") slplugin_res_path = self.dst_path_of("SLPlugin.app/Contents/Resources")
for libfile in ("libllcommon.dylib", for libfile in ("libllcommon.dylib",
"libapr-1.0.3.7.dylib", "libapr-1.0.dylib",
"libaprutil-1.0.3.8.dylib", "libaprutil-1.0.dylib",
"libexpat.0.5.0.dylib"): "libexpat.0.5.0.dylib"):
target_lib = os.path.join('../../..', libfile) target_lib = os.path.join('../../..', libfile)
self.run_command("ln -sf %(target)r %(link)r" % self.run_command("ln -sf %(target)r %(link)r" %

8
install.xml
View File

@@ -90,9 +90,9 @@
<key>darwin</key> <key>darwin</key>
<map> <map>
<key>md5sum</key> <key>md5sum</key>
<string>115d8ac44a91efdb173e9b3e478c46b6</string> <string>2486db13c5ed9340855da3c1c48772af</string>
<key>url</key> <key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.3.7-darwin-20090805.tar.bz2</uri> <uri>https://github.com/downloads/LightDrake/SingularityViewer/apr_suite-1.4.2-darwin-20110217.tar.bz2</uri>
</map> </map>
<key>linux</key> <key>linux</key>
<map> <map>
@@ -1300,9 +1300,9 @@ anguage Infrstructure (CLI) international standard</string>
<key>darwin</key> <key>darwin</key>
<map> <map>
<key>md5sum</key> <key>md5sum</key>
<string>c844e1b05723ce078dbbd5aea9cdd3ad</string> <string>58ef62004b508b234039f6a313d852eb</string>
<key>url</key> <key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.1.4-darwin-20080818.tar.bz2</uri> <uri>https://github.com/downloads/LightDrake/SingularityViewer/zlib-1.2.5-darwin-20110211.tar.bz2</uri>
</map> </map>
<key>linux</key> <key>linux</key>
<map> <map>