reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-28 06:00:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

winemaker: Put the defines in DEFINES instead of CEXTRA.

Browse Source
This commit is contained in:
André Hentschel 2009-08-13 16:43:37 +02:00 committed by Alexandre Julliard
parent 60fc01a0c4
commit e1e9dc398f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/winemaker
View File

@ -535,6 +535,7 @@ sub source_scan_project_file($$$)
# some more settings
my $path=dirname($filename);
my $prj_target_cflags;
my $prj_target_defines;
my $prj_target_ldflags;
my $prj_target_libs;
my $prj_name;
@ -662,7 +663,7 @@ sub source_scan_project_file($$$)
# Use Multithreaded Run-Time Library
} elsif (/^D\s*\"(.*)\"/) {
# Preprocessor Definitions
$prj_target_cflags.="-D".$1." ";
$prj_target_defines.="-D".$1." ";
} elsif (/^I\s*\"(.*)\"/) {
# Additional Include Directories
$sfilet=$1;
@ -841,6 +842,7 @@ sub source_scan_project_file($$$)
push @{@$project_settings[$T_LIBRARIES]},$prj_target_libs;
push @{@$project_settings[$T_CEXTRA]},$prj_target_cflags;
push @{@$project_settings[$T_CXXEXTRA]},$prj_target_cflags;
push @{@$project_settings[$T_DEFINES]},$prj_target_defines;
push @{@$project_settings[$T_LDFLAGS]},$prj_target_ldflags;
} elsif ($filename =~ /.vcproj$/i) {
# Import XML::LibXML, you need the libxml package (deb: libxml-libxml-perl, rpm: perl-libxml-perl)
@ -923,7 +925,7 @@ sub source_scan_project_file($$$)
if ($vc_compiler_tool->getName eq "PreprocessorDefinitions") {
$configt=$vc_compiler_tool->getValue;
$configt=~s/;/ -D/g;
$prj_target_cflags.="-D".$configt." ";
$prj_target_defines.="-D".$configt." ";
}
if ($vc_compiler_tool->getName eq "AdditionalIncludeDirectories") {
$configt=$vc_compiler_tool->getValue;
@ -948,6 +950,7 @@ sub source_scan_project_file($$$)
push @{@$project_settings[$T_LIBRARIES]},$prj_target_libs;
push @{@$project_settings[$T_CEXTRA]},$prj_target_cflags;
push @{@$project_settings[$T_CXXEXTRA]},$prj_target_cflags;
push @{@$project_settings[$T_DEFINES]},$prj_target_defines;
}
my $target_count;