livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a couple more packaging problems...

master
Alain Linden 2011-02-08 12:14:17 -08:00
parent c2bfa25299
commit 6dd41886b3
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/cmake/Copy3rdPartyLibs.cmake
View File

@ -37,6 +37,8 @@ if(WINDOWS)
libapr-1.dll
libaprutil-1.dll
libapriconv-1.dll
ssleay32.dll
libeay32.dll
)
set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
@ -46,6 +48,8 @@ if(WINDOWS)
libaprutil-1.dll
libapriconv-1.dll
dbghelp.dll
ssleay32.dll
libeay32.dll
)
if(USE_GOOGLE_PERFTOOLS)

2
indra/newview/CMakeLists.txt
View File

@ -1547,7 +1547,7 @@ if (WINDOWS)
${ARCH_PREBUILT_DIRS_RELEASE}/codecs/qtwcodecsd4.dll
SLPlugin
media_plugin_quicktime
#media_plugin_webkit
media_plugin_webkit
winmm_shim
windows-crash-logger
windows-updater

16
indra/newview/viewer_manifest.py
View File

@ -302,6 +302,10 @@ class WindowsManifest(ViewerManifest):
self.path("zlib1.dll")
self.path("vivoxplatform.dll")
self.path("vivoxoal.dll")
# Security
self.path("ssleay32.dll")
self.path("libeay32.dll")
# For use in crash reporting (generates minidumps)
if self.args['configuration'].lower() != 'debug':
@ -394,12 +398,12 @@ class WindowsManifest(ViewerManifest):
self.end_prefix()
# For WebKit/Qt plugin runtimes (codec/character encoding plugins)
# if self.prefix(src="codecs", dst="codecs"):
# self.path("qcncodecs4.dll")
# self.path("qjpcodecs4.dll")
# self.path("qkrcodecs4.dll")
# self.path("qtwcodecs4.dll")
# self.end_prefix()
if self.prefix(src="codecs", dst="codecs"):
self.path("qcncodecs4.dll")
self.path("qjpcodecs4.dll")
self.path("qkrcodecs4.dll")
self.path("qtwcodecs4.dll")
self.end_prefix()
self.end_prefix()