Rebase against 7bd852c6ce0299f14fa585c124bae029f0d6d214.

This commit is contained in:
Sebastian Lackner
2015-11-09 17:04:55 +01:00
parent 9d447d1e4b
commit f98e04ebc1
6 changed files with 49 additions and 293 deletions

View File

@@ -1,4 +1,4 @@
From 4ecefb9629cb3121da17e7d9573c5134dcdc74c6 Mon Sep 17 00:00:00 2001
From eee7c92a62872ca06bb864674ea73ddab09f362e Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 6 Oct 2014 05:06:06 +0200
Subject: dbghelp: Always check for debug symbols in BINDIR.
@@ -9,14 +9,14 @@ Subject: dbghelp: Always check for debug symbols in BINDIR.
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in
index e483693..03248a6 100644
index 86846cb..6b72980 100644
--- a/dlls/dbghelp/Makefile.in
+++ b/dlls/dbghelp/Makefile.in
@@ -1,6 +1,6 @@
MODULE = dbghelp.dll
IMPORTLIB = dbghelp
-EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DDLLPREFIX='"$(DLLPREFIX)"'
+EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DDLLPREFIX='"$(DLLPREFIX)"' -DBINDIR="\"${bindir}\""
-EXTRADEFS = -D_IMAGEHLP_SOURCE_
+EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DBINDIR="\"${bindir}\""
IMPORTS = psapi
DELAYIMPORTS = version
EXTRALIBS = $(Z_LIBS) $(CORESERVICES_LIBS) $(COREFOUNDATION_LIBS)
@@ -40,5 +40,5 @@ index b176143..8e22265 100644
load_offset, dyn_addr, elf_info);
}
--
2.4.4
2.6.2