msvcmaker: Link with msvcrt(d).dll rather than with the static C library.

Francois Gouget fgouget at free.fr
Wed Dec 6 05:04:55 CST 2006


---

The msvcrt/data.c test needs to link with msvcrt(d).dll so if can do a 
GetProcAddress() on _initterm, though it could be modified to do a 
LoadLibrary("msvcrt.dll") instead of a GetModuleHandle("msvcrt.dll" || 
"msvcrtd.dll"). But I see no drawback to linking all tests to 
msvcrt.dll.

 tools/winapi/msvcmaker |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker
index a6c2bcc..b94cd92 100755
--- a/tools/winapi/msvcmaker
+++ b/tools/winapi/msvcmaker
@@ -579,7 +579,7 @@ sub _generate_dsp($$) {
 		print OUT "# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od";
 		@defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 _DEBUG _MBCS _LIB));
 	    } else {
-		print OUT "# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od";
+		print OUT "# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od";
 		@defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 _DEBUG _WINDOWS _MBCS _USRDLL), ("\U${project}\E_EXPORTS"));
 	    }
 	} else {
@@ -587,7 +587,7 @@ sub _generate_dsp($$) {
 		print OUT "# ADD BASE CPP /nologo /W3 /GX /O2";
 		@defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 NDEBUG _MBCS _LIB));
 	    } else {
-		print OUT "# ADD BASE CPP /nologo /MT /W3 /GX /O2";
+		print OUT "# ADD BASE CPP /nologo /MD /W3 /GX /O2";
 		@defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 NDEBUG _WINDOWS _MBCS _USRDLL), ("\U${project}\E_EXPORTS"));
 	    }
 	}
@@ -608,18 +608,18 @@ sub _generate_dsp($$) {
 	my @defines2;
 	if($debug) {
 	    if($lib) {
-		print OUT "# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od";
+		print OUT "# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od";
 		@defines2 = qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 _DEBUG _WINDOWS _MBCS _LIB);
 	    } else {
-		print OUT "# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od";
+		print OUT "# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od";
 		@defines2 = qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 _DEBUG WIN32 _WINDOWS _MBCS _USRDLL);
 	    }
 	} else {
 	    if($lib) {
-		print OUT "# ADD CPP /nologo /MT /W3 /GX /O2";
+		print OUT "# ADD CPP /nologo /MD /W3 /GX /O2";
 		@defines2 = qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 NDEBUG _WINDOWS _MBCS _LIB);
 	    } else {
-		print OUT "# ADD CPP /nologo /MT /W3 /GX /O2";
+		print OUT "# ADD CPP /nologo /MD /W3 /GX /O2";
 		@defines2 = qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 NDEBUG WIN32 _WINDOWS _MBCS _USRDLL);
 	    }
 	}
-- 
1.4.3.3



More information about the wine-patches mailing list