diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 4 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/newview/viewer_manifest.py | 16 |
3 files changed, 15 insertions, 7 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 938cec3800..0c65229afc 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -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) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index a7279bd86f..ef1d05a779 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -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 diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 2c8d4bc6d5..ed7422433e 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -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() |