From d333fd9766c85135c8107e7445123b092988d53b Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Wed, 21 Nov 2012 17:48:17 +0000
Subject: [PATCH] Update the Makefile

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2757 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 lib/Makefile.MinGW | 19 +++++++++++++------
 mainwindow.cpp     |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/lib/Makefile.MinGW b/lib/Makefile.MinGW
index 0327642c0..e511092d5 100644
--- a/lib/Makefile.MinGW
+++ b/lib/Makefile.MinGW
@@ -5,7 +5,7 @@
 CC = gcc
 FC = g95
 
-FFLAGS = -O0 -fbounds-check -Wall -Wno-precision-loss -fno-second-underscore
+FFLAGS = -O2 -fbounds-check -Wall -Wno-precision-loss -fno-second-underscore
 CFLAGS = -I. -fbounds-check -mno-stack-arg-probe
 
 # Default rules
@@ -20,7 +20,7 @@ CFLAGS = -I. -fbounds-check -mno-stack-arg-probe
 %.o: %.F90
 	${FC} ${FFLAGS} -c $<
 
-all:    libjt9.a jt9sim.exe jt9.exe jt9code.exe
+all:    libjt9.a jt9sim.exe jt9.exe jt9code.exe jt9test.exe
 
 OBJS1 = pctile.o graycode.o sort.o ssort.o \
 	unpackmsg.o igray.o unpackcall.o unpackgrid.o \
@@ -31,15 +31,18 @@ OBJS1 = pctile.o graycode.o sort.o ssort.o \
 	packbits.o unpackbits.o encode232.o interleave9.o \
 	entail.o fano232.o gran.o spec9.o sync9.o decode9.o \
 	peakdt9.o peakdf9.o fil3.o redsync.o decoder.o \
-	grid2n.o n2grid.o timer.o
+	grid2n.o n2grid.o timer.o 
 
 libjt9.a: $(OBJS1)
 	ar cr libjt9.a $(OBJS1) 
 	ranlib libjt9.a
 
-OBJS2 = jt9.o 
+OBJS2 = jt9.o jt9a.o ipcomm.o sleep_msec.o
+LIBS2 = -L'c:/QtSDK/Desktop/Qt/4.7.4/mingw/lib' -lQtCore4
 jt9.exe: $(OBJS2) libjt9.a
-	$(FC) -o jt9.exe $(OBJS2) libjt9.a ../libfftw3f_win.a 
+	g++ -o jt9.exe $(OBJS2) $(LIBS2) libjt9.a ../libfftw3f_win.a \
+	c:/MinGW/lib/libf95.a
+	cp jt9.exe ../../wsjtx_install
 
 OBJS3 = jt9sim.o 
 jt9sim.exe: $(OBJS3) libjt9.a
@@ -49,6 +52,10 @@ OBJS4 = jt9code.o
 jt9code.exe: $(OBJS4) libjt9.a
 	$(FC) -o jt9code.exe $(OBJS4) libjt9.a
 
+OBJS5 = jt9test.o 
+jt9test.exe: $(OBJS5) libjt9.a
+	$(FC) -o jt9test.exe $(OBJS5) libjt9.a ../libfftw3f_win.a 
+
 INCPATH = -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include/QtCore' \
 	 -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include' \
 	 -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include/ActiveQt' \
@@ -87,4 +94,4 @@ sec_midn.o: sec_midn.f90
 .PHONY : clean
 
 clean:
-	rm -f *.o libjt9.a wsjtx.exe jt9sim.exe jt9.exe t1.exe t2.exe
+	rm -f *.o libjt9.a wsjtx.exe jt9sim.exe jt9.exe jt9test.exe
diff --git a/mainwindow.cpp b/mainwindow.cpp
index e1cf3cbf3..85e3276b8 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,4 +1,4 @@
-//-------------------------------------------------------------- MainWindow
+//------------------------------------------------------------- MainWindow
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "devsetup.h"