foreach $i (split '\n',$store{'gui-apps'}) {
$i =~ s/^# //;
+ $speciallibs = [split ' ', $i];
+ $i = shift @$speciallibs; # take off project name
$gui{$i} = 1;
+ $libs{$i} = $speciallibs;
}
foreach $i (split '\n',$store{'console-apps'}) {
$i =~ s/^# //;
- $gui{$i} = -0;
+ $speciallibs = [split ' ', $i];
+ $i = shift @$speciallibs; # take off project name
+ $gui{$i} = 0;
+ $libs{$i} = $speciallibs;
}
sub project {
"\n".
"CFLAGS = -mno-cygwin -Wall -O2 -D_WINDOWS -DDEBUG -DWIN32S_COMPAT -D_NO_OLDNAMES -I.\n".
"LDFLAGS = -mno-cygwin -s\n".
-"RCFLAGS = \$(RCINC) --define WIN32=1 --define _WIN32=1 --define WINVER=0x0400\n".
+"RCFLAGS = \$(RCINC) --define WIN32=1 --define _WIN32=1 --define WINVER=0x0400 --define MINGW32_FIX=1\n".
"LIBS = -ladvapi32 -luser32 -lgdi32 -lwsock32 -lcomctl32 -lcomdlg32\n".
"OBJ=o\n".
"RES=res.o\n".
foreach $p (@projects) {
print $p, ".exe: ", &project($p), "\n";
my $mw = $gui{$p} ? " -mwindows" : "";
- print "\t\$(CC)" . $mw . " \$(LDFLAGS) -o \$@ " . &project($p), " \$(LIBS)\n\n";
+ $libstr = "";
+ foreach $lib (@{$libs{$p}}) { $libstr .= " -l$lib"; }
+ print "\t\$(CC)" . $mw . " \$(LDFLAGS) -o \$@ " . &project($p), " \$(LIBS)$libstr\n\n";
}
print $store{"dependencies"};
print
##-- Borland makefile
open OUT, ">Makefile.bor"; select OUT;
print
-"# Makefile for PuTTY under Borland C.\n";
+"# Makefile for PuTTY under Borland C++.\n";
# bcc32 command line option is -D not /D
($_ = $store{"help"}) =~ s/=\/D/=-D/gs;
print $_;
"# so that the .rsp files still depend on the correct makefile.\n".
"MAKEFILE = Makefile.bor\n".
"\n".
-"# Stop windows.h including winsock2.h which would conflict with winsock 1\n".
-"CFLAGS = -DWIN32_LEAN_AND_MEAN\n".
-"\n".
"# Get include directory for resource compiler\n".
"!if !\$d(BCB)\n".
"BCB = \$(MAKEDIR)\\..\n".
".c.obj:\n".
"\tbcc32 \$(COMPAT) \$(FWHACK) \$(CFLAGS) /c \$*.c\n".
".rc.res:\n".
-"\tbrc32 \$(FWHACK) \$(RCFL) -i \$(BCB)\\include \\\n".
-"\t\t-r -DWIN32 -D_WIN32 -DWINVER=0x0400 \$*.rc\n".
+"\tbrcc32 \$(FWHACK) \$(RCFL) -i \$(BCB)\\include \\\n".
+"\t\t-r -DNO_WINRESRC_H -DWIN32 -D_WIN32 -DWINVER=0x0400 \$*.rc\n".
"\n".
"OBJ=obj\n".
"RES=res\n".
print "\n\n";
foreach $p (@projects) {
print $p, ".exe: ", &project($p), " $p.rsp\n";
- $tw = $gui{$p} ? " -tW" : "";
- print "\tbcc32$tw -e$p.exe \@$p.rsp\n";
- print "\tbrc32 -fe$p.exe " . (join " ", &project("resources.$p")) . "\n\n";
+ $ap = $gui{$p} ? " -aa" : " -ap";
+ print "\tilink32$ap -Gn -L\$(BCB)\\lib \@$p.rsp\n\n";
}
foreach $p (@projects) {
print $p, ".rsp: \$(MAKEFILE)\n";
- $arrow = ">";
- foreach $i (&projlist("objects.$p")) {
- print "\techo \$($i) $arrow $p.rsp\n";
- $arrow = ">>";
+ $c0w = $gui{$p} ? "c0w32" : "c0x32";
+ print "\techo $c0w + > $p.rsp\n";
+ @objlines = &projlist("objects.$p");
+ for ($i=0; $i<=$#objlines; $i++) {
+ $plus = ($i < $#objlines ? " +" : "");
+ print "\techo \$($objlines[$i])$plus >> $p.rsp\n";
}
+ print "\techo $p.exe >> $p.rsp\n";
+ @libs = @{$libs{$p}};
+ unshift @libs, "cw32", "import32";
+ $libstr = join ' ', @libs;
+ print "\techo nul,$libstr, >> $p.rsp\n";
+ print "\techo " . (join " ", &project("resources.$p")) . " >> $p.rsp\n";
print "\n";
}
print $store{"dependencies"};
"\tdel *.res\n".
"\tdel *.pch\n".
"\tdel *.aps\n".
-"\tdel *.ilk\n".
+"\tdel *.il*\n".
"\tdel *.pdb\n".
-"\tdel *.rsp\n";
+"\tdel *.rsp\n".
+"\tdel *.tds\n".
+"\tdel *.\$\$\$\$\$\$\n";
select STDOUT; close OUT;