New Makefile.jtsdk and updated wsjtx.pro allow builds from within

QtCreator, as before.  Now uses gfortran (rather than g95) in Windows.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@3943 ab8295b8-cf94-4d9e-aec4-7959e3be5d79

libm65/Makefile.jtsdk

@@ -0,0 +1,106 @@
+# 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++
+
+FFLAGS = -O2 -fbounds-check -Wall -Wno-precision-loss -fno-second-underscore
+CFLAGS = -I. -fbounds-check
+
+# Default rules
+%.o: %.c
+	${CC} ${CFLAGS} -c $<
+%.o: %.f
+	${FC} ${FFLAGS} -c $<
+%.o: %.F
+	${FC} ${FFLAGS} -c $<
+%.o: %.f90
+	${FC} ${FFLAGS} -c $<
+%.o: %.F90
+	${FC} ${FFLAGS} -c $<
+
+all:    libm65.a m65.exe JT65code.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 \
+	wrapkarn.o nchar.o init_rs.o encode_rs.o decode_rs.o \
+	four2a.o rfile3a.o grid2deg.o pfxdump.o dpol.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
+
+libm65.a: $(OBJS1)
+	ar cr libm65.a $(OBJS1) 
+	ranlib libm65.a
+
+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
+
+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
+
+libastro.a: $(OBJS7)
+	ar cr libastro.a $(OBJS7)
+	ranlib libastro.a
+
+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' 
+
+ipcomm.o: ipcomm.cpp
+	$(CXX) -c $(INCPATH) ipcomm.cpp
+
+#m65a.o:	m65a.f90
+#	$(FC) -c -fno-second-underscore -cpp m65a.f90
+
+sec_midn.o: sec_midn.f90
+	$(FC) -c -fno-second-underscore sec_midn.f90
+
+#symspec.o: ../symspec.f90
+#	$(FC) -c $(FFLAGS) -o symspec.o ../symspec.f90
+
+OBJS4 = tastro.o astro0.o libm65.a
+tastro.exe: $(OBJS4)
+	$(FC) $(FFLAGS) -o tastro.exe $(OBJS4) libm65.a 
+
+OBJS5 = t1.o timer.o libm65.a
+t1.exe: $(OBJS5)
+	$(FC) $(FFLAGS) -o t1.exe $(OBJS5) libm65.a 
+
+#astro0.o: ../astro0.f90
+#	$(FC) -c $(FFLAGS) -o astro0.o ../astro0.f90
+
+init_rs.o: init_rs.c
+	$(CC) -c -DBIGSYM=1 -o init_rs.o init_rs.c
+
+encode_rs.o: encode_rs.c
+	$(CC) -c -DBIGSYM=1 -o encode_rs.o encode_rs.c
+
+decode_rs.o: decode_rs.c
+	$(CC) -c -DBIGSYM=1 -o decode_rs.o decode_rs.c
+
+.PHONY : clean
+
+clean:
+	rm -f *.o libm65.a m65.exe jt65code.exe

libm65/usleep.c

@@ -0,0 +1,7 @@
+#include <unistd.h>
+
+/* usleep(3) */
+void usleep_(unsigned long *microsec)
+{
+  usleep(*microsec);
+}

mainwindow.cpp

@@ -1,4 +1,4 @@
-//-------------------------------------------------------------- MainWindow
+//------------------------------------------------------------- MainWindow
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "devsetup.h"

map65.pro

@@ -13,25 +13,20 @@ TARGET = map65
 VERSION = 2.3.0
 TEMPLATE = app
 DEFINES = QT5
-
-win32 {
-DEFINES = WIN32
 DESTDIR = ../map65_install
-F90 = g95
-g95.output = ${QMAKE_FILE_BASE}.o
-g95.commands = $$F90 -c -O2 -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
-g95.input = F90_SOURCES
-QMAKE_EXTRA_COMPILERS += g95
-}
 
-unix {
-DEFINES = UNIX
-DESTDIR = ../map65_install
 F90 = gfortran
 gfortran.output = ${QMAKE_FILE_BASE}.o
 gfortran.commands = $$F90 -c -O2 -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
 gfortran.input = F90_SOURCES
 QMAKE_EXTRA_COMPILERS += gfortran
+
+win32 {
+DEFINES = WIN32
+}
+
+unix {
+DEFINES = UNIX
 }
 
 SOURCES += main.cpp mainwindow.cpp plotter.cpp about.cpp \
@@ -64,11 +59,12 @@ LIBS += -lfftw3f -lportaudio -lgfortran
 win32 {
 LIBS += ../map65/libm65/libm65.a
 LIBS += ../map65/libfftw3f_win.a
-LIBS += /users/joe/wsjt/QtSupport/palir-02.dll
+LIBS += ../map65/palir-02.dll
 LIBS += libwsock32
-LIBS += C:/MinGW/lib/libf95.a
+#LIBS += C:/MinGW/lib/libf95.a
+LIBS += -lgfortran
 #LIBS += -lusb
 LIBS += /users/joe/linrad/3.37/libusb.a
 LIBS += -lQt5Concurrent
-#LIBS += c:\wsjt-env\Qt5\Tools\mingw48_32\i686-w64-mingw32\lib\libmingwex.a
+#LIBS += c:\JTSDK-QT\Qt5\Tools\mingw48_32\i686-w64-mingw32\lib\libmingwex.a
 }

ss.bat

@@ -1 +1 @@
-svn status | grep -v '?'
+svn status | grep -v "?"