diff options
Diffstat (limited to 'tmake')
| -rwxr-xr-x | tmake/bin/tmake | 4 | ||||
| -rwxr-xr-x | tmake/lib/hpux-acc/tmake.conf | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tmake/bin/tmake b/tmake/bin/tmake index 4862c3f..9158d7a 100755 --- a/tmake/bin/tmake +++ b/tmake/bin/tmake @@ -457,7 +457,7 @@ sub Project { $r = ""; foreach ( @settings ) { $v = $_; - if ( $v =~ s/^\s*((?:[^:\s]*?:)?)(\w+)\s*(\+=|\*=|\-=|\/=|=)// ) { + if ( $v =~ s/^\s*([^:\r\n]+:)?(\w+)\s*(\+=|\*=|\-=|\/=|=)// ) { $if_var = $1; if ( $if_var ne "" ) { chop $if_var; @@ -550,7 +550,7 @@ sub ScanProject { s/\#.*//; # strip comment s/^\s+//; # strip white space s/\s+$//; - if ( /^\s*((?:(?:[^:\s]*?:)?)\w+\s*(\+|\-|\*|\/)?=)/ ) { + if ( /^(([^:\r\n]+:)?\w+\s*(\+|\-|\*|\/)?=)/ ) { $var = $1; # var also contains the ".=" s/^.*?=\s*//; if ( /^\<\<(.*)$/ ) { diff --git a/tmake/lib/hpux-acc/tmake.conf b/tmake/lib/hpux-acc/tmake.conf index 2c49784..a8f539d 100755 --- a/tmake/lib/hpux-acc/tmake.conf +++ b/tmake/lib/hpux-acc/tmake.conf @@ -8,7 +8,7 @@ TEMPLATE = app CONFIG = qt warn_on release TMAKE_CC = aCC -TMAKE_CFLAGS = -w -D__STRICT_ANSI__ +TMAKE_CFLAGS = -w -D__STRICT_ANSI__ -DPNG_USE_LOCAL_ARRAYS TMAKE_CFLAGS_WARN_ON = TMAKE_CFLAGS_WARN_OFF = TMAKE_CFLAGS_RELEASE = -O |