Jacek Caban : makefiles: Explicitly import msvcrt in modules that need specific crt version.

Alexandre Julliard julliard at winehq.org
Fri Mar 20 17:08:21 CDT 2020


Module: wine
Branch: master
Commit: 14df0183b0b43049d0f645f72f435309cb6836a4
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=14df0183b0b43049d0f645f72f435309cb6836a4

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Fri Mar 20 14:36:25 2020 +0100

makefiles: Explicitly import msvcrt in modules that need specific crt version.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/msvcirt/Makefile.in      | 1 +
 dlls/msvcp60/Makefile.in      | 1 +
 dlls/msvcrt20/Makefile.in     | 1 +
 dlls/ntoskrnl.exe/Makefile.in | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/msvcirt/Makefile.in b/dlls/msvcirt/Makefile.in
index 65be0729dc..619a3dd66d 100644
--- a/dlls/msvcirt/Makefile.in
+++ b/dlls/msvcirt/Makefile.in
@@ -1,6 +1,7 @@
 MODULE    = msvcirt.dll
 EXTRADEFS = -D_MSVCIRT
 PARENTSRC = ../msvcp90
+IMPORTS   = msvcrt
 
 EXTRADLLFLAGS = -mno-cygwin
 
diff --git a/dlls/msvcp60/Makefile.in b/dlls/msvcp60/Makefile.in
index bb73e7b74d..5271fc21e2 100644
--- a/dlls/msvcp60/Makefile.in
+++ b/dlls/msvcp60/Makefile.in
@@ -1,6 +1,7 @@
 MODULE    = msvcp60.dll
 EXTRADEFS = -D_MSVCP_VER=60
 PARENTSRC = ../msvcp90
+IMPORTS   = msvcrt
 
 EXTRADLLFLAGS = -mno-cygwin
 
diff --git a/dlls/msvcrt20/Makefile.in b/dlls/msvcrt20/Makefile.in
index 0b80514363..0696bfccea 100644
--- a/dlls/msvcrt20/Makefile.in
+++ b/dlls/msvcrt20/Makefile.in
@@ -1,5 +1,6 @@
 EXTRADEFS = -DUSE_MSVCRT_PREFIX
 MODULE    = msvcrt20.dll
+IMPORTS   = msvcrt
 
 EXTRADLLFLAGS = -mno-cygwin
 
diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in
index a75ca9768d..67afa8f9d8 100644
--- a/dlls/ntoskrnl.exe/Makefile.in
+++ b/dlls/ntoskrnl.exe/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = ntoskrnl.exe
 IMPORTLIB = ntoskrnl
-IMPORTS   = advapi32 hal
+IMPORTS   = advapi32 hal msvcrt
 DELAYIMPORTS = setupapi user32
 
 EXTRADLLFLAGS = -mno-cygwin




More information about the wine-cvs mailing list