From dd8c9eb98a86b3d3716719b739480c562f72c880 Mon Sep 17 00:00:00 2001
From: brad kittenbrink <brad@lindenlab.com>
Date: Fri, 18 Mar 2011 12:24:04 -0400
Subject: [PATCH] Removal of dbghelp cruft. Reviewed by alain and nat.
---
autobuild.xml | 24 -------------------
indra/cmake/Copy3rdPartyLibs.cmake | 1 -
indra/newview/CMakeLists.txt | 3 ---
indra/newview/viewer_manifest.py | 4 ----
.../win_crash_logger/llcrashloggerwindows.cpp | 1 -
5 files changed, 33 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 06f37044e93..76cec04ab01 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -291,30 +291,6 @@
</map>
</map>
</map>
- <key>dbghelp</key>
- <map>
- <key>license</key>
- <string>MSDTW</string>
- <key>license_file</key>
- <string>LICENSES/dbghelp.txt</string>
- <key>name</key>
- <string>dbghelp</string>
- <key>platforms</key>
- <map>
- <key>windows</key>
- <map>
- <key>archive</key>
- <map>
- <key>hash</key>
- <string>c5d28b13ce16a46f2e35eb133f7d92e8</string>
- <key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/dbghelp-6.11.1.404-windows-20101011.tar.bz2</string>
- </map>
- <key>name</key>
- <string>windows</string>
- </map>
- </map>
- </map>
<key>dbusglib</key>
<map>
<key>license</key>
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index e2b7d3b888a..46981160226 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -47,7 +47,6 @@ if(WINDOWS)
libapr-1.dll
libaprutil-1.dll
libapriconv-1.dll
- dbghelp.dll
ssleay32.dll
libeay32.dll
)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 4c8b3e84a25..0e407d92d3a 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1289,8 +1289,6 @@ if (WINDOWS)
if (INTEL_MEMOPS_LIBRARY)
list(APPEND viewer_LIBRARIES ${INTEL_MEMOPS_LIBRARY})
endif (INTEL_MEMOPS_LIBRARY)
-
- use_prebuilt_binary(dbghelp)
endif (WINDOWS)
# Add the xui files. This is handy for searching for xui elements
@@ -1499,7 +1497,6 @@ if (WINDOWS)
${CMAKE_CURRENT_SOURCE_DIR}/licenses-win32.txt
${CMAKE_CURRENT_SOURCE_DIR}/featuretable.txt
${CMAKE_CURRENT_SOURCE_DIR}/featuretable_xp.txt
- ${ARCH_PREBUILT_DIRS_RELEASE}/dbghelp.dll
${ARCH_PREBUILT_DIRS_RELEASE}/libeay32.dll
${ARCH_PREBUILT_DIRS_RELEASE}/qtcore4.dll
${ARCH_PREBUILT_DIRS_RELEASE}/qtgui4.dll
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index b48b0e7a3af..80e47125a07 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -306,10 +306,6 @@ def construct(self):
self.path("ssleay32.dll")
self.path("libeay32.dll")
- # For use in crash reporting (generates minidumps)
- if self.args['configuration'].lower() != 'debug':
- self.path("dbghelp.dll")
-
# For google-perftools tcmalloc allocator.
try:
if self.args['configuration'].lower() == 'debug':
diff --git a/indra/win_crash_logger/llcrashloggerwindows.cpp b/indra/win_crash_logger/llcrashloggerwindows.cpp
index 354b7e6cc38..51ff754c27a 100644
--- a/indra/win_crash_logger/llcrashloggerwindows.cpp
+++ b/indra/win_crash_logger/llcrashloggerwindows.cpp
@@ -34,7 +34,6 @@
#include "boost/tokenizer.hpp"
-#include "dbghelp.h"
#include "indra_constants.h" // CRASH_BEHAVIOR_ASK, CRASH_SETTING_NAME
#include "llerror.h"
#include "llfile.h"
--
GitLab