Update Makefile generation and ensure everything works with Borland 5.5

git-svn-id: svn://svn.tartarus.org/sgt/putty@684 cda61777-01e9-0310-a592-d414129be87e

diff --git a/Makefile b/Makefile
index 731cf5d..c90384e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -88,7 +88,7 @@ LRESRC = plink.$(RES)
 # pageant
 ##-- console-apps
 # pscp
-# plink
+# plink ws2_32
 ##--
 
 LIBS1 = advapi32.lib user32.lib gdi32.lib

diff --git a/mkfiles.pl b/mkfiles.pl
index d46bb82..2d1b625 100755 (executable)
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -29,12 +29,18 @@ close IN;
 
 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 {
@@ -91,7 +97,9 @@ print
 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
@@ -118,9 +126,6 @@ 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".
@@ -155,7 +160,10 @@ foreach $p (@projects) {
     print "\techo \$($objlines[$i])$plus >> $p.rsp\n";
   }
   print "\techo $p.exe >> $p.rsp\n";
-  print "\techo nul,cw32 import32, >> $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";
 }

diff --git a/plink.c b/plink.c
index 1d68e97..938bcb7 100644 (file)
--- a/plink.c
+++ b/plink.c
@@ -177,7 +177,7 @@ static int get_password(const char *prompt, char *str, int maxlen)
     return 1;
 }
 
-static int WINAPI stdin_read_thread(void *param) {
+static DWORD WINAPI stdin_read_thread(void *param) {
     struct input_data *idata = (struct input_data *)param;
     HANDLE inhandle;