parent
27d541116b
commit
dd8c9eb98a
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -47,7 +47,6 @@ if(WINDOWS)
|
|||
libapr-1.dll
|
||||
libaprutil-1.dll
|
||||
libapriconv-1.dll
|
||||
dbghelp.dll
|
||||
ssleay32.dll
|
||||
libeay32.dll
|
||||
)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -306,10 +306,6 @@ class WindowsManifest(ViewerManifest):
|
|||
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':
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Reference in New Issue