diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-17 13:12:15 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-17 13:12:15 +0100 |
| commit | c22c118458b3eafd0b71cf61f9edb33e9770802e (patch) | |
| tree | d63783277e504b6c407706f21aa5ba091b24b93a | |
| parent | 48501fb37dd46c2e9f6f016dd987b13e61dd476a (diff) | |
Fix build.
| -rw-r--r-- | src/lib/stack.cpp | 10 | ||||
| -rw-r--r-- | src/lib/wscript | 2 | ||||
| -rw-r--r-- | wscript | 3 |
3 files changed, 12 insertions, 3 deletions
diff --git a/src/lib/stack.cpp b/src/lib/stack.cpp index b3479b1bb..24668dfe7 100644 --- a/src/lib/stack.cpp +++ b/src/lib/stack.cpp @@ -11,13 +11,15 @@ #include <stdexcept> #include <sstream> -#include "dbg/stack.hpp" +#include "stack.hpp" #if defined(_WIN32) # include <windows.h> # include <imagehlp.h> # if defined(__MINGW32__) +# define PACKAGE 1 +# define PACKAGE_VERSION 1 # include <bfd.h> // link against libbfd and libiberty # include <psapi.h> // link against psapi # include <cxxabi.h> @@ -192,7 +194,7 @@ namespace public: explicit windows_dll(const std::string &libname) : name_(libname), - lib_(LoadLibrary(name_.c_str())) + lib_(LoadLibraryA(name_.c_str())) { if (!lib_) throw std::runtime_error("Failed to load dll " + name_); } @@ -329,7 +331,11 @@ namespace if (func.empty()) { +#if defined(_WIN64) + DWORD64 dummy = 0; +#else DWORD dummy = 0; +#endif BOOL got_symbol = SymGetSymFromAddr(process, frame.AddrPC.Offset, &dummy, symbol); func = got_symbol ? symbol->Name : unknown_function; } diff --git a/src/lib/wscript b/src/lib/wscript index 129b8d9fb..dcf44a7e8 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -68,7 +68,7 @@ def build(bld): SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP GLIB LZMA """ if bld.env.TARGET_WINDOWS: - obj.uselib += ' WINSOCK2' + obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY' obj.source = sources + ' stack.cpp' else: obj.source = sources @@ -32,6 +32,9 @@ def configure(conf): conf.env.append_value('CXXFLAGS', ['-mconsole']) conf.env.append_value('LINKFLAGS', ['-mconsole']) conf.check(lib = 'ws2_32', uselib_store = 'WINSOCK2', msg = "Checking for library winsock2") + conf.check(lib = 'bfd', uselib_store = 'BFD', msg = "Checking for library bfd") + conf.check(lib = 'dbghelp', uselib_store = 'DBGHELP', msg = "Checking for library dbghelp") + conf.check(lib = 'iberty', uselib_store = 'IBERTY', msg = "Checking for library iberty") boost_lib_suffix = '-mt' boost_thread = 'boost_thread_win32-mt' else: |