From c51b612e2a9e4200d16bad3f7d1590c9f2af4c3d Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Fri, 22 Jun 2007 12:10:01 +0000
Subject: [PATCH] Fix Makefile.win

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@402 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 Makefile.win |  9 ++++++---
 map65a.f90   | 14 ++++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Makefile.win b/Makefile.win
index eddc7e255..f2d77a0e7 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -9,7 +9,7 @@ FFLAGS = /traceback /fast /nologo /check:all
 
 all:    MAP65.EXE
 
-OBJS2C   = init_rs.o encode_rs.o decode_rs.o jtaudio.o
+OBJS2C   = init_rs.o encode_rs.o decode_rs.o jtaudio.o plrr_subs.o
 
 F2PYONLY = ftn_init ftn_quit audio_init getfile azdist0 astro0 \
 	spec map65a0
@@ -18,7 +18,7 @@ SRCS2F90 = a2d.f90 astro0.f90 audio_init.f90 azdist0.f90 \
 	decode1.f90 ftn_init.f90 ftn_quit.f90 wsjtgen.f90 \
 	runqqq.f90 fivehz.f90 flushqqq.f90 map65a0.f90 \
 	rfile.f90 rfile3a.f90 spec.f90 map65a.f90 display.F90 \
-	getfile.f90 getfile2.f90
+	getfile.f90 getfile2.f90 recvpkt.f90
 
 SRCS2F77 = indexx.f gen65.f chkmsg.f \
 	gentone.f gencwid.f set.f db.f pctile.f sort.f ssort.f \
@@ -44,7 +44,7 @@ Audio.pyd: $(OBJS2C) $(SRCS2F90) $(SRCS2F77) $(SRCS2C)
 	--opt="/nologo /traceback /warn:errors /fast /fpp /define:Win32 \
 	      /define:USE_PORTAUDIO" \
 	$(OBJS2C) \
-	-lwinmm -lpa -lfftw3single -llibsamplerate \
+	-lwinmm -lws2_32 -lpa -lfftw3single -llibsamplerate \
 	-m Audio \
 	only: $(F2PYONLY) : \
 	$(SRCS2F90) $(SRCS2F77) $(SRCS2C)
@@ -80,6 +80,9 @@ wrapkarn.obj: wrapkarn.c
 igray.obj: igray.c
 	$(CC) /nologo /c /DWin32=1 igray.c
 
+plrr_subs.o: plrr_subs_win.c
+	$(CC) /nologo /c plrr_subs_win.c /Foplrr_subs.o
+
 .PHONY : clean
 
 clean:
diff --git a/map65a.f90 b/map65a.f90
index 2e0fd9235..4deaadbea 100644
--- a/map65a.f90
+++ b/map65a.f90
@@ -35,20 +35,22 @@ subroutine map65a
   if(nutc.ne.nutc0) nfile=nfile+1
   nutc0=nutc
   nutcdata=nutc
-  write(utcdata,1001) nutc
-1001 format(i4.4)
+  write(utcdata,1002) nutc
+1002 format(i4.4)
   utcdata=utcdata(1:2)//':'//utcdata(3:4)
 
-  tskip=0.
-!  fselect=126.0 + 1.6 + 0.290
+!  fselect=126.0 + 1.6 + 0.290                ! K6MYC (NG??)
 !  nflip=-1
 !  ip0=1
-  fselect=128.0 + 1.6 + 0.220               !AA1YN
+
+  fselect=128.0 + 1.6 + 0.220               ! AA1YN (OK)
   nflip=1
   ip0=3
-!  fselect=155.0 + 1.6 + 0.454
+
+!  fselect=155.0 + 1.6 + 0.454                ! N0AKC (OK)
 !  nflip=1
 !  ip0=2
+
 !  fselect=103 + 1.6 - 0.07
 !  nflip=-1                     !May need to try both +/- 1
 !  ip0=4                       !Try all four?