André Hentschel : winemaker: Put the defines in DEFINES instead of CEXTRA.
Alexandre Julliard
julliard at winehq.org
Thu Aug 13 10:41:30 CDT 2009
Module: wine
Branch: master
Commit: e1e9dc398f58c57abb9ae581b9dd9d6b9aa57ea1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1e9dc398f58c57abb9ae581b9dd9d6b9aa57ea1
Author: André Hentschel <nerv at dawncrow.de>
Date: Thu Aug 13 16:43:37 2009 +0200
winemaker: Put the defines in DEFINES instead of CEXTRA.
---
tools/winemaker | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/winemaker b/tools/winemaker
index 060e207..b2e58cc 100755
--- a/tools/winemaker
+++ b/tools/winemaker
@@ -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;
More information about the wine-cvs
mailing list