ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcmaker: Factor out some common settings. 

Factor out writing of common compiler settings and setting of common defines.

Factor out the writing of HAVE_* defines in include/config.h and sort
the resulting defines before writing.
This commit is contained in:
Rob Shearman 2008-09-25 16:43:23 +01:00 committed by Alexandre Julliard
parent d7a5ff025e
commit fb4355cb5b
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tools/winapi/msvcmaker
View File

@ -576,23 +576,24 @@ sub _generate_dsp($$) {
print OUT "# PROP Ignore_Export_Lib 0\r\n" if $dll; print OUT "# PROP Ignore_Export_Lib 0\r\n" if $dll;
print OUT "# PROP Target_Dir \"\"\r\n"; print OUT "# PROP Target_Dir \"\"\r\n";
my @defines; print OUT "# ADD BASE CPP /nologo ";
my @defines = qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 WIN32);
if($debug) { if($debug) {
if($lib || $exe) { if($lib || $exe) {
print OUT "# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od"; push @defines, qw(_DEBUG _MBCS _LIB);
@defines = (qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 WIN32 _DEBUG _MBCS _LIB));
} else { } else {
print OUT "# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od"; print OUT "/MDd ";
@defines = (qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 WIN32 _DEBUG _WINDOWS _MBCS _USRDLL), ("\U${project}\E_EXPORTS")); push @defines, (qw(_DEBUG _WINDOWS _MBCS _USRDLL), ("\U${project}\E_EXPORTS"));
} }
print OUT "/W3 /Gm /GX /Zi /Od";
} else { } else {
if($lib || $exe) { if($lib || $exe) {
print OUT "# ADD BASE CPP /nologo /W3 /GX /O2"; push @defines, qw(NDEBUG _MBCS _LIB);
@defines = (qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 WIN32 NDEBUG _MBCS _LIB));
} else { } else {
print OUT "# ADD BASE CPP /nologo /MD /W3 /GX /O2"; print OUT "/MD ";
@defines = (qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 WIN32 NDEBUG _WINDOWS _MBCS _USRDLL), ("\U${project}\E_EXPORTS")); push @defines, (qw(NDEBUG _WINDOWS _MBCS _USRDLL), ("\U${project}\E_EXPORTS"));
} }
print OUT "/W3 /GX /O2";
} }
foreach my $define (@defines) { foreach my $define (@defines) {
@ -1120,6 +1121,7 @@ if ($options->wine) {
sub _generate_config_h($) { sub _generate_config_h($) {
local *OUT = shift; local *OUT = shift;
my @defines;
print OUT "#define __WINE_CONFIG_H\n"; print OUT "#define __WINE_CONFIG_H\n";
print OUT "\n"; print OUT "\n";
@ -1127,8 +1129,7 @@ sub _generate_config_h($) {
my @headers = qw(direct.h fcntl.h io.h string.h process.h); my @headers = qw(direct.h fcntl.h io.h string.h process.h);
foreach my $header (@headers) { foreach my $header (@headers) {
$header =~ y/\.\//__/; $header =~ y/\.\//__/;
print OUT "#define HAVE_\U$header\E\n"; push @defines, "HAVE_\U$header\E 1";
print OUT "\n";
} }
my @functions = qw( my @functions = qw(
@ -1141,12 +1142,11 @@ sub _generate_config_h($) {
wcslen wcslen
); );
foreach my $function (@functions) { foreach my $function (@functions) {
print OUT "#define HAVE_\U$function\E 1\n"; push @defines, "HAVE_\U$function\E 1";
print OUT "\n";
} }
if(0) { foreach my $define (sort(@defines)) {
print OUT "#define NEED_STDCALL_DECORATION 1\n"; print OUT "#define $define\n";
print OUT "\n"; print OUT "\n";
} }