Skip to content

W
wine-winehq
Commit baf85ad9 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

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

parent f1698c4b
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
tools/winapi/msvcmaker
View file @ baf85ad9
...@@ -578,7 +578,7 @@ sub _generate_dsp($$) { ...@@ -578,7 +578,7 @@ sub _generate_dsp($$) {
print OUT "# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od"; 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)); @defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 _DEBUG _MBCS _LIB));
} else { } 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")); @defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 _DEBUG _WINDOWS _MBCS _USRDLL), ("\U${project}\E_EXPORTS"));
} }
} else { } else {
...@@ -586,7 +586,7 @@ sub _generate_dsp($$) { ...@@ -586,7 +586,7 @@ sub _generate_dsp($$) {
print OUT "# ADD BASE CPP /nologo /W3 /GX /O2"; print OUT "# ADD BASE CPP /nologo /W3 /GX /O2";
@defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 NDEBUG _MBCS _LIB)); @defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 NDEBUG _MBCS _LIB));
} else { } 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")); @defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 NDEBUG _WINDOWS _MBCS _USRDLL), ("\U${project}\E_EXPORTS"));
} }
} }
...@@ -607,18 +607,18 @@ sub _generate_dsp($$) { ...@@ -607,18 +607,18 @@ sub _generate_dsp($$) {
my @defines2; my @defines2;
if($debug) { if($debug) {
if($lib) { 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); @defines2 = qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 _DEBUG _WINDOWS _MBCS _LIB);
} else { } 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); @defines2 = qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 _DEBUG WIN32 _WINDOWS _MBCS _USRDLL);
} }
} else { } else {
if($lib) { 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); @defines2 = qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 NDEBUG _WINDOWS _MBCS _LIB);
} else { } 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); @defines2 = qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 NDEBUG WIN32 _WINDOWS _MBCS _USRDLL);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment