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)
set(APR_LIBRARIES
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.0.3.7.dylib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.0.3.7.dylib
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.0.dylib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.0.dylib
)
set(APRUTIL_LIBRARIES
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.0.3.8.dylib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.0.3.8.dylib
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.0.dylib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.0.dylib
)
set(APRICONV_LIBRARIES iconv)
else (WINDOWS)

8
indra/newview/viewer_manifest.py
View File

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