mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-02-03 21:52:24 +00:00
Fix problems with resource compilation Makefile lines
[originally from svn r371]
This commit is contained in:
parent
21d2f97597
commit
6e7131412e
6
Makefile
6
Makefile
@ -21,7 +21,7 @@
|
|||||||
# - COMPAT=/DWIN32S_COMPAT
|
# - COMPAT=/DWIN32S_COMPAT
|
||||||
# Generates a binary that works (minimally) with Win32s.
|
# Generates a binary that works (minimally) with Win32s.
|
||||||
#
|
#
|
||||||
# - CFL=/DASCIICTLS
|
# - RCFL=/DASCIICTLS
|
||||||
# Uses ASCII rather than Unicode to specify the tab control in
|
# Uses ASCII rather than Unicode to specify the tab control in
|
||||||
# the resource file. Probably most useful when compiling with
|
# the resource file. Probably most useful when compiling with
|
||||||
# Cygnus/mingw32, whose resource compiler may have less of a
|
# Cygnus/mingw32, whose resource compiler may have less of a
|
||||||
@ -124,13 +124,13 @@ versionpseudotarget:
|
|||||||
win_res.$(RES): win_res.rc win_res.h putty.ico
|
win_res.$(RES): win_res.rc win_res.h putty.ico
|
||||||
##--
|
##--
|
||||||
win_res.$(RES):
|
win_res.$(RES):
|
||||||
rc $(FWHACK) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 win_res.rc
|
rc $(FWHACK) $(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 win_res.rc
|
||||||
|
|
||||||
##-- dependencies
|
##-- dependencies
|
||||||
scp.$(RES): scp.rc scp.ico
|
scp.$(RES): scp.rc scp.ico
|
||||||
##--
|
##--
|
||||||
scp.$(RES):
|
scp.$(RES):
|
||||||
rc $(FWHACK) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 scp.rc
|
rc $(FWHACK) $(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 scp.rc
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
del *.obj
|
del *.obj
|
||||||
|
@ -85,7 +85,7 @@ print
|
|||||||
"\t\$(CC) \$(FWHACK) \$(CFLAGS) -c \$<\n".
|
"\t\$(CC) \$(FWHACK) \$(CFLAGS) -c \$<\n".
|
||||||
"\n".
|
"\n".
|
||||||
"%.o: %.rc\n".
|
"%.o: %.rc\n".
|
||||||
"\t\$(RC) \$(FWHACK) \$(RCFLAGS) \$<\n".
|
"\t\$(RC) \$(FWHACK) \$(RCFL) \$(RCFLAGS) \$< \$\@\n".
|
||||||
"\n";
|
"\n";
|
||||||
foreach $p (@projects) {
|
foreach $p (@projects) {
|
||||||
print $p, ".exe: ", &project($p), "\n";
|
print $p, ".exe: ", &project($p), "\n";
|
||||||
@ -127,7 +127,7 @@ print
|
|||||||
".c.obj:\n".
|
".c.obj:\n".
|
||||||
"\tbcc32 \$(COMPAT) \$(FWHACK) \$(CFLAGS) /c \$*.c\n".
|
"\tbcc32 \$(COMPAT) \$(FWHACK) \$(CFLAGS) /c \$*.c\n".
|
||||||
".rc.res:\n".
|
".rc.res:\n".
|
||||||
"\tbrc32 \$(FWHACK) -i \$(BCB)\\include \\\n".
|
"\tbrc32 \$(FWHACK) \$(RCFL) -i \$(BCB)\\include \\\n".
|
||||||
"\t\t-r -DWIN32 -D_WIN32 -DWINVER=0x0400 \$*.rc\n".
|
"\t\t-r -DWIN32 -D_WIN32 -DWINVER=0x0400 \$*.rc\n".
|
||||||
"\n".
|
"\n".
|
||||||
"OBJ=obj\n".
|
"OBJ=obj\n".
|
||||||
|
Loading…
Reference in New Issue
Block a user