From 0b90cfbaf1130f4fea806c491b1c62710bf632ec Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 25 Oct 2012 13:02:38 +0000 Subject: [PATCH] Save new Makefile git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2689 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/Makefile.MinGW | 26 ++++++++++++++++++++++++-- mainwindow.cpp | 2 +- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/lib/Makefile.MinGW b/lib/Makefile.MinGW index 15baeb9e9..c3c48470a 100644 --- a/lib/Makefile.MinGW +++ b/lib/Makefile.MinGW @@ -30,7 +30,8 @@ OBJS1 = pctile.o graycode.o \ symspec.o timf2.o analytic.o db.o genjt9.o ptt.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 + peakdt9.o peakdf9.o fil3.o redsync.o decoder.o \ + grid2n.o n2grid.o libjt9.a: $(OBJS1) ar cr libjt9.a $(OBJS1) @@ -46,7 +47,7 @@ jt9sim.exe: $(OBJS3) libjt9.a OBJS4 = t1.o t1.exe: $(OBJS4) libjt9.a - $(FC) -o t1.exe $(OBJS4) libjt9.a ../libfftw3f_win.a + $(FC) -o t1.exe $(OBJS4) libjt9.a OBJS5 = t2.o t2.exe: $(OBJS5) libjt9.a @@ -60,6 +61,27 @@ INCPATH = -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include/QtCore' \ #jt9.o: jt9.f90 # $(FC) -O0 -c jt9.f90 +sync9.o: sync9.f90 jt9sync.f90 + $(FC) $(FFLAGS) -c sync9.f90 + +spec9.o: spec9.f90 jt9sync.f90 + $(FC) $(FFLAGS) -c spec9.f90 + +peakdf9.o: peakdf9.f90 jt9sync.f90 + $(FC) $(FFLAGS) -c peakdf9.f90 + +peakdt9.o: peakdt9.f90 jt9sync.f90 + $(FC) $(FFLAGS) -c peakdt9.f90 + +jt9sim.o: jt9sim.f90 jt9sync.f90 + $(FC) $(FFLAGS) -c jt9sim.f90 + +genjt9.o: genjt9.f90 jt9sync.f90 + $(FC) $(FFLAGS) -c genjt9.f90 + +redsync.o: redsync.f90 jt9sync.f90 + $(FC) $(FFLAGS) -c redsync.f90 + ipcomm.o: ipcomm.cpp g++ -c $(INCPATH) ipcomm.cpp diff --git a/mainwindow.cpp b/mainwindow.cpp index 2df3f15b7..9df9c5fcc 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//---------------------------------------------------------------- MainWindow +//--------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h"