From cdf7ef74e706e6d8dae3fc2f2e205233ed57570a Mon Sep 17 00:00:00 2001
From: Antony Polukhin <antoshkka@gmail.com>
Date: Sat, 4 Mar 2017 04:17:51 +0300
Subject: [PATCH] Another attempt to remove MSVC specific extensions (3)

---
 build/Jamfile.v2 | 2 +-
 test/Jamfile.v2  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index 15cfb05..159ad9c 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -112,7 +112,7 @@ lib boost_stacktrace_windbg
     ../src/windbg.cpp
   : # requirements
     <warnings>all
-    <library>Dbghelp
+    <library>Dbgeng <library>ole32
     <link>shared:<define>BOOST_STACKTRACE_DYN_LINK=1
     [ check-target-builds ../build//WinDbg : : <build>no ]
   : # default build
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index a527818..18759df 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -7,8 +7,9 @@
 
 lib dl : : <link>shared ;
 lib gcc_s ;
-lib Dbghelp ;
 lib rt ;
+lib Dbgeng ;
+lib ole32 ;
 
 local LIBBACKTRACE_PATH = [ modules.peek : LIBBACKTRACE_PATH ] ;
 lib backtrace
@@ -36,7 +37,7 @@ local HIDE_SYMBS = <target-os>linux:<cxxflags>"-fvisibility=hidden" ;
 
 local BT_DEPS   = $(HIDE_SYMBS) <target-os>linux:<library>dl <library>backtrace [ check-target-builds ../build//libbacktrace : : <build>no ] ;
 local UNWD_DEPS = $(HIDE_SYMBS) <target-os>linux:<library>dl  [ check-target-builds ../build//addr2line : : <build>no ] ;
-local WIND_DEPS = $(HIDE_SYMBS) <library>Dbghelp [ check-target-builds ../build//WinDbg : : <build>no ] ;
+local WIND_DEPS = $(HIDE_SYMBS) <library>Dbgeng <library>ole32 [ check-target-builds ../build//WinDbg : : <build>no ] ;
 local NOOP_DEPS = $(HIDE_SYMBS) ;
 local BASIC_DEPS = $(RDYNAMIC) <target-os>linux:<library>dl [ check-target-builds ../build//WinDbg : <build>no ] ;