André Hentschel : winemaker: Read the includes of a dsp project file.
Alexandre Julliard
julliard at winehq.org
Wed May 20 08:29:33 CDT 2009
Module: wine
Branch: master
Commit: abc68c1ca75a5fd4a3b275fc8be94f2f71e4beb3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=abc68c1ca75a5fd4a3b275fc8be94f2f71e4beb3
Author: André Hentschel <nerv at dawncrow.de>
Date: Tue May 19 21:01:55 2009 +0200
winemaker: Read the includes of a dsp project file.
---
tools/winemaker | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/winemaker b/tools/winemaker
index 8170720..3d45247 100755
--- a/tools/winemaker
+++ b/tools/winemaker
@@ -663,9 +663,11 @@ sub source_scan_project_file($$$)
} elsif (/^D\s*\"(.*)\"/) {
# Preprocessor Definitions
$prj_target_cflags.="-D".$1." ";
- } elsif (/^I/) {
+ } elsif (/^I\s*\"(.*)\"/) {
# Additional Include Directories
- #$prj_target_cflags.="-I" fixpath(option)
+ $sfilet=$1;
+ $sfilet=~s/\\/\//g;
+ push @{@$project_settings[$T_INCLUDE_PATH]},"-I".$sfilet." ";
} elsif (/^U\s*\"(.*)\"/) {
# Undefines a previously defined symbol
$prj_target_cflags.="-U".$1." ";
@@ -1847,6 +1849,7 @@ sub get_real_include_name($$$$$)
foreach my $include (@{@$target[$T_INCLUDE_PATH]}, @{@$project_settings[$T_INCLUDE_PATH]}) {
my $dirname=$include;
$dirname=~ s+^-I++;
+ $dirname=~ s+\s$++;
if (!is_absolute($dirname)) {
$dirname="@$project[$P_PATH]$dirname";
} else {
More information about the wine-cvs
mailing list