From 93eecbf08e33e2ad60ff2da4d5c9403a9ecb4aec Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 30 Jan 2014 18:08:40 +0000 Subject: [PATCH] Previous commit message should also have mentioned: 5. F7 now toggles the Setup menu item "Double-click on call sets Tx Enable". Present state is written to Status Bar label 3. The present commit updates the makefiles. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3673 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/Makefile.MinGW | 9 +++++++-- lib/Makefile.linux | 9 +++++++-- mainwindow.cpp | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/lib/Makefile.MinGW b/lib/Makefile.MinGW index 79703f6ad..854a2325b 100644 --- a/lib/Makefile.MinGW +++ b/lib/Makefile.MinGW @@ -32,9 +32,9 @@ CFLAGS = -I. -fbounds-check -mno-stack-arg-probe %.o: %.F90 ${FC} ${FFLAGS} -c $< -all: libjt9.a jt9sim.exe jt9.exe jt9code.exe jt65.exe +all: libjt9.a jt9sim.exe jt9.exe jt9code.exe jt65code.exe jt65.exe -OBJS1 = pctile.o graycode.o sort.o ssort.o \ +OBJS1 = pctile.o graycode.o sort.o ssort.o chkmsg.o \ unpackmsg.o igray.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 \ @@ -78,6 +78,11 @@ OBJS5 = jt65.o jt65.exe: $(OBJS5) libjt9.a $(FC) -o jt65.exe $(OBJS5) libjt9.a ../libfftw3f_win.a +OBJS6 = jt65code.o +jt65code.exe: $(OBJS6) libjt9.a + $(FC) -o jt65code.exe $(OBJS6) libjt9.a + cp jt65code.exe $(EXE_DIR) + sync9.o: sync9.f90 jt9sync.f90 $(FC) $(FFLAGS) -c sync9.f90 diff --git a/lib/Makefile.linux b/lib/Makefile.linux index 27664f67a..e9e61b0af 100644 --- a/lib/Makefile.linux +++ b/lib/Makefile.linux @@ -22,9 +22,9 @@ CFLAGS = -I. -fbounds-check -fPIE %.o: %.F90 ${FC} ${FFLAGS} -c $< -all: libjt9.a jt9sim jt9 jt9code +all: libjt9.a jt9sim jt9 jt9code jt65code -OBJS1 = pctile.o graycode.o sort.o ssort.o \ +OBJS1 = pctile.o graycode.o sort.o ssort.o chkmsg.o \ unpackmsg.o igray.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 \ @@ -64,6 +64,11 @@ jt9code: $(OBJS4) libjt9.a $(FC) -o jt9code $(OBJS4) -L. -ljt9 cp jt9code $(EXE_DIR) +OBJS6 = jt65code.o +jt65code: $(OBJS6) libjt9.a + $(FC) -o jt65code $(OBJS6) libjt9.a + cp jt65code $(EXE_DIR) + sync9.o: sync9.f90 jt9sync.f90 $(FC) $(FFLAGS) -c sync9.f90 diff --git a/mainwindow.cpp b/mainwindow.cpp index 3d5029bf9..8280e9827 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//---------------------------------------------------------- MainWindow +//--------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h"