Skip to content
Snippets Groups Projects
Commit dd8c9eb9 authored by brad kittenbrink's avatar brad kittenbrink
Browse files

Removal of dbghelp cruft.

Reviewed by alain and nat.
parent 27d54111
No related branches found
No related tags found
No related merge requests found
...@@ -291,30 +291,6 @@ ...@@ -291,30 +291,6 @@
</map> </map>
</map> </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> <key>dbusglib</key>
<map> <map>
<key>license</key> <key>license</key>
......
...@@ -47,7 +47,6 @@ if(WINDOWS) ...@@ -47,7 +47,6 @@ if(WINDOWS)
libapr-1.dll libapr-1.dll
libaprutil-1.dll libaprutil-1.dll
libapriconv-1.dll libapriconv-1.dll
dbghelp.dll
ssleay32.dll ssleay32.dll
libeay32.dll libeay32.dll
) )
......
...@@ -1289,8 +1289,6 @@ if (WINDOWS) ...@@ -1289,8 +1289,6 @@ if (WINDOWS)
if (INTEL_MEMOPS_LIBRARY) if (INTEL_MEMOPS_LIBRARY)
list(APPEND viewer_LIBRARIES ${INTEL_MEMOPS_LIBRARY}) list(APPEND viewer_LIBRARIES ${INTEL_MEMOPS_LIBRARY})
endif (INTEL_MEMOPS_LIBRARY) endif (INTEL_MEMOPS_LIBRARY)
use_prebuilt_binary(dbghelp)
endif (WINDOWS) endif (WINDOWS)
# Add the xui files. This is handy for searching for xui elements # Add the xui files. This is handy for searching for xui elements
...@@ -1499,7 +1497,6 @@ if (WINDOWS) ...@@ -1499,7 +1497,6 @@ if (WINDOWS)
${CMAKE_CURRENT_SOURCE_DIR}/licenses-win32.txt ${CMAKE_CURRENT_SOURCE_DIR}/licenses-win32.txt
${CMAKE_CURRENT_SOURCE_DIR}/featuretable.txt ${CMAKE_CURRENT_SOURCE_DIR}/featuretable.txt
${CMAKE_CURRENT_SOURCE_DIR}/featuretable_xp.txt ${CMAKE_CURRENT_SOURCE_DIR}/featuretable_xp.txt
${ARCH_PREBUILT_DIRS_RELEASE}/dbghelp.dll
${ARCH_PREBUILT_DIRS_RELEASE}/libeay32.dll ${ARCH_PREBUILT_DIRS_RELEASE}/libeay32.dll
${ARCH_PREBUILT_DIRS_RELEASE}/qtcore4.dll ${ARCH_PREBUILT_DIRS_RELEASE}/qtcore4.dll
${ARCH_PREBUILT_DIRS_RELEASE}/qtgui4.dll ${ARCH_PREBUILT_DIRS_RELEASE}/qtgui4.dll
......
...@@ -306,10 +306,6 @@ def construct(self): ...@@ -306,10 +306,6 @@ def construct(self):
self.path("ssleay32.dll") self.path("ssleay32.dll")
self.path("libeay32.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. # For google-perftools tcmalloc allocator.
try: try:
if self.args['configuration'].lower() == 'debug': if self.args['configuration'].lower() == 'debug':
......
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
#include "boost/tokenizer.hpp" #include "boost/tokenizer.hpp"
#include "dbghelp.h"
#include "indra_constants.h" // CRASH_BEHAVIOR_ASK, CRASH_SETTING_NAME #include "indra_constants.h" // CRASH_BEHAVIOR_ASK, CRASH_SETTING_NAME
#include "llerror.h" #include "llerror.h"
#include "llfile.h" #include "llfile.h"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment