Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
a62703e6
Commit
a62703e6
authored
Feb 12, 2001
by
François Gouget
Committed by
Alexandre Julliard
Feb 12, 2001
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure all files are terminated with a '\n'.
Remove obsolete comment about 'afxres.h' coming back after editing in VC. Added support for the RTF qualifier in RC files.
parent
82b517de
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
winemaker
tools/winemaker
+8
-6
No files found.
tools/winemaker
View file @
a62703e6
...
...
@@ -3,7 +3,7 @@
# Copyright 2000 Francois Gouget for CodeWeavers
# fgouget@codeweavers.com
#
my
$version
=
"0.5.
5
"
;
my
$version
=
"0.5.
6
"
;
use
Cwd
;
use
File::
Basename
;
...
...
@@ -1268,14 +1268,16 @@ sub fix_file
my
$rc_textinclude_state
=
0
;
while
(
<
FILEI
>
)
{
$line
++
;
$_
=~
s/\r\n$/\n/
;
s/\r\n$/\n/
;
if
(
!
/\n$/
)
{
# Make sure all files are '\n' terminated
$_
.=
"\n"
;
}
if
(
$is_rc
and
!
$is_mfc
and
/^(\s*\#\s*include\s*)\"afxres\.h\"/
)
{
# VC6 automatically includes 'afxres.h', an MFC specific header, in
# the RC files it generates (even in non-MFC projects). So we replace
# it with 'winres.h' its very close standard cousin so that non MFC
# projects can compile in Wine without the MFC sources. This does not
# harm VC but it will put 'afxres.h' back the next time the file is
# edited.
# projects can compile in Wine without the MFC sources.
my
$warning
=
"mfc:afxres.h"
;
if
(
!
defined
$warnings
{
$warning
})
{
$warnings
{
$warning
}
=
"1"
;
...
...
@@ -1320,7 +1322,7 @@ sub fix_file
$modified
=
1
;
}
}
elsif
(
$is_rc
)
{
if
(
$rc_block_depth
==
0
and
/^(\w+\s+(BITMAP|CURSOR|FONT|FONTDIR|ICON|MESSAGETABLE|TEXT)\s+((DISCARDABLE|FIXED|IMPURE|LOADONCALL|MOVEABLE|PRELOAD|PURE)\s+)*)([\"<]?)([^\">\r\n]+)([\">]?)/
)
{
if
(
$rc_block_depth
==
0
and
/^(\w+\s+(BITMAP|CURSOR|FONT|FONTDIR|ICON|MESSAGETABLE|TEXT)\s+((DISCARDABLE|FIXED|IMPURE|LOADONCALL|MOVEABLE|PRELOAD|PURE
|RTF
)\s+)*)([\"<]?)([^\">\r\n]+)([\">]?)/
)
{
my
$from_file
=
(
$5
eq
"<"
?
""
:
$dirname
);
my
$real_include_name
=
get_real_include_name
(
$line
,
$6
,
$from_file
,
$project
,
$target
);
print
FILEO
"$1$5$real_include_name$7$'"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment