Updates for building on Windows.

libm65/CMakeLists.txt

@@ -151,14 +151,14 @@ set (CSRCS
   usleep.c
   wrapkarn.c
   
-  ../../wsjtx/lib/qra/qra64/qra64.c
-  ../../wsjtx/lib/qra/qra64/qra64_subs.c
-  ../../wsjtx/lib/qra/qracodes/npfwht.c
-  ../../wsjtx/lib/qra/qracodes/pdmath.c 
-  ../../wsjtx/lib/qra/qracodes/qra12_63_64_irr_b.c
-  ../../wsjtx/lib/qra/qracodes/qra13_64_64_irr_e.c
-  ../../wsjtx/lib/qra/qracodes/qracodes.c
-  ../../wsjtx/lib/qra/qracodes/normrnd.c
+#  qra64/qra64.c
+#  qra64/qra64_subs.c
+#  qracodes/npfwht.c
+#  qracodes/pdmath.c 
+#  qracodes/qra12_63_64_irr_b.c
+#  qracodes/qra13_64_64_irr_e.c
+#  qracodes/qracodes.c
+#  qracodes/normrnd.c
 )
 
 if (WIN32)

libm65/Makefile.jtsdk

@@ -1,7 +1,7 @@
 # Makefile for MinGW on Windows
-CC  = c:/JTSDK-QT/Qt5/Tools/mingw48_32/bin/gcc
-FC = c:/JTSDK-QT/Qt5/Tools/mingw48_32/bin/gfortran
-CXX = c:/JTSDK-QT/Qt5/Tools/mingw48_32/bin/g++
+CC  = c:/JTSDK/Qt55/Tools/mingw492_32/bin/gcc
+FC = c:/JTSDK/Qt55/Tools/mingw492_32/bin/gfortran
+CXX = c:/JTSDK/Qt55/Tools/mingw492_32/bin/g++
 
 FFLAGS = -O2 -fbounds-check -Wall -Wno-precision-loss -fno-second-underscore
 CFLAGS = -I. -fbounds-check
@@ -18,41 +18,61 @@ CFLAGS = -I. -fbounds-check
 %.o: %.F90
 	${FC} ${FFLAGS} -c $<
 
-all:    libm65.a m65.exe JT65code.exe mapsim.exe libastro.a
+all:    packjt.o libm65.a m65.exe mapsim.exe libastro.a
 
 OBJS1 = trimlist.o display.o getdphi.o pctile.o ccf65.o \
 	decode1a.o sort.o filbig.o fil6521.o afc65b.o \
 	twkfreq.o decode65b.o indexx.o ssort.o fchisq.o setup65.o \
 	extract.o deep65.o ccf2.o demod64a.o chkhist.o graycode.o \
-	interleave63.o unpackmsg.o encode65.o igray.o set.o unpackcall.o \
-	unpackgrid.o grid2k.o unpacktext.o getpfx2.o packmsg.o \
-	deg2grid.o packtext.o getpfx1.o packcall.o k2grid.o packgrid.o \
+	interleave63.o encode65.o igray.o set.o shell.o qra64_subs.o \
+	grid2k.o getpfx2.o qra64b.o qra64c.o twkfreq_xy.o qra64zap.o \
+	deg2grid.o getpfx1.o k2grid.o ftrsd2.o graycode65.o \
 	wrapkarn.o nchar.o init_rs.o encode_rs.o decode_rs.o \
-	four2a.o rfile3a.o grid2deg.o pfxdump.o dpol.o \
+	four2a.o rfile3a.o grid2deg.o pfxdump.o dpol.o sync64.o spec64.o \
 	astro.o tm2.o sun.o moondop.o coord.o tmoonsub.o \
 	geocentric.o moon2.o toxyz.o dot.o dcoord.o f77_wisdom.o \
 	gen65.o chkmsg.o ptt.o astrosub.o astro0.o recvpkt.o symspec.o \
-	iqcal.o iqfix.o timf2.o s3avg.o
+	iqcal.o iqfix.o timf2.o s3avg.o packjt.o badmsg.o fmtmsg.o \
+	qracodes.o qra64.o smo.o averms.o lorentzian.o npfwht.o pdmath.o \
+	qra13_64_64_irr_e.o fchisq0.o genqra64a.o
+
+packjt.o: packjt.f90
+	$(FC) -c packjt.f90
 
 libm65.a: $(OBJS1)
 	ar cr libm65.a $(OBJS1) 
 	ranlib libm65.a
 
+qra64_subs.o: ./qra64/qra64_subs.c
+	gcc -c -O2 -o qra64_subs.o ./qra64/qra64_subs.c
+	
+qracodes.o: ../../wsjtx/lib/qra/qracodes/qracodes.c
+	gcc -c -O2 -o qracodes.o ../../wsjtx/lib/qra/qracodes/qracodes.c
+
+qra64.o: ../../wsjtx/lib/qra/qra64/qra64.c
+	gcc -c -O2 -o qra64.o ../../wsjtx/lib/qra/qra64/qra64.c
+
+qra13_64_64_irr_e.o: ../../wsjtx/lib/qra/qracodes/qra13_64_64_irr_e.c
+	gcc -c -O2 -o qra13_64_64_irr_e.o  \
+	../../wsjtx/lib/qra/qracodes/qra13_64_64_irr_e.c
+
+npfwht.o: ../../wsjtx/lib/qra/qracodes/npfwht.c
+	gcc -c -O2 -o npfwht.o ../../wsjtx/lib/qra/qracodes/npfwht.c
+
+pdmath.o: ../../wsjtx/lib/qra/qracodes/pdmath.c
+	gcc -c -O2 -o pdmath.o ../../wsjtx/lib/qra/qracodes/pdmath.c
+
 OBJS3 = m65.o m65a.o map65a.o symspec.o decode0.o ftninit.o ftnquit.o \
 	timer.o ipcomm.o sec_midn.o usleep.o
 # cutil.o 
 
-LIBS3 = -L'C:/JTSDK-QT/Qt5/5.2.1/mingw48_32/lib' -lQt5Core
+LIBS3 = -L'C:/JTSDK/Qt55/5.5/mingw492_32/lib' -lQt5Core
 
 m65.exe: $(OBJS3) libm65.a
 	$(CXX) -o m65.exe $(OBJS3) $(LIBS3) libm65.a ../libfftw3f_win.a \
 	-lgfortran
 	cp m65.exe ../../map65_install
 
-OBJS2 = JT65code.o
-JT65code.exe: $(OBJS2) libm65.a
-	$(FC) -o JT65code.exe $(OBJS2) libm65.a
-
 OBJS7 = astrosub.o astro0.o astro.o tm2.o grid2deg.o sun.o moondop.o \
 	coord.o dot.o moon2.o tmoonsub.o toxyz.o geocentric.o \
 	dcoord.o
@@ -65,8 +85,8 @@ OBJS6 = mapsim.o cgen65.o noisegen.o gran.o
 mapsim.exe: $(OBJS6) libm65.a
 	$(FC) -o mapsim.exe $(OBJS6) libm65.a
 
-INCPATH = -I'C:/JTSDK-QT/Qt5/5.2.1/mingw48_32/include/QtCore' \
-	-I'C:/JTSDK-QT/Qt5/5.2.1/mingw48_32/include' 
+INCPATH = -I'C:/JTSDK/Qt55/5.5/mingw492_32/include/QtCore' \
+	-I'C:/JTSDK/Qt55/5.5/mingw492_32/include' 
 
 ipcomm.o: ipcomm.cpp
 	$(CXX) -c $(INCPATH) ipcomm.cpp
@@ -103,4 +123,4 @@ decode_rs.o: decode_rs.c
 .PHONY : clean
 
 clean:
-	rm -f *.o libm65.a m65.exe jt65code.exe
+	rm -f *.o *.mod libm65.a m65.exe

libm65/display.f90

@@ -1,11 +1,11 @@
 subroutine display(nkeep,ftol)
 
-  parameter (MAXLINES=400,MX=400)
+  parameter (MAXLINES=400,MX=400,MAXCALLS=500)
   integer indx(MAXLINES),indx2(MX)
   character*83 line(MAXLINES),line2(MX),line3(MAXLINES)
   character out*52,cfreq0*3,livecq*58
   character*6 callsign,callsign0
-  character*12 freqcall(100)
+  character*12 freqcall(MAXCALLS)
   real freqkHz(MAXLINES)
   integer utc(MAXLINES),utc2(MX),utcz
   real*8 f0
@@ -142,7 +142,7 @@ subroutine display(nkeep,ftol)
            len=i2-1
            if(len.lt.0) len=6
            if(len.ge.4) then                        !Omit short "callsigns"
-              nc=nc+1
+              if(nc.lt.MAXCALLS) nc=nc+1
               freqcall(nc)=cfreq0//' '//callsign//line3(k)(73:74)
               callsign0=callsign
            endif
@@ -153,9 +153,9 @@ subroutine display(nkeep,ftol)
      endif
   enddo
   flush(19)
-  nc=nc+1
+  if(nc.lt.MAXCALLS) nc=nc+1
   freqcall(nc)='            '
-  nc=nc+1
+  if(nc.lt.MAXCALLS) nc=nc+1
   freqcall(nc)='            '
   freqcall(nc+1)='            '
   freqcall(nc+2)='            '

map65.pro

@@ -64,7 +64,7 @@ LIBS += libwsock32
 #LIBS += C:/MinGW/lib/libf95.a
 LIBS += -lgfortran
 #LIBS += -lusb
-LIBS += /users/joe/linrad/3.37/libusb.a
-LIBS += -lQt5Concurrent
+LIBS += ../map65/libusb.a
+#LIBS += -lQt5Concurrent
 #LIBS += c:\JTSDK-QT\Qt5\Tools\mingw48_32\i686-w64-mingw32\lib\libmingwex.a
 }