w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-22 20:28:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Previous commit message should also have mentioned:

Browse Source 
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
This commit is contained in:
Joe Taylor 2014-01-30 18:08:40 +00:00
parent f7e39a2009
commit 93eecbf08e
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Makefile.MinGW
View File

@ -32,9 +32,9 @@ CFLAGS = -I. -fbounds-check -mno-stack-arg-probe
%.o: %.F90 %.o: %.F90
${FC} ${FFLAGS} -c $< ${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 \ unpackmsg.o igray.o unpackcall.o unpackgrid.o \
grid2k.o unpacktext.o getpfx2.o packmsg.o deg2grid.o \ grid2k.o unpacktext.o getpfx2.o packmsg.o deg2grid.o \
packtext.o getpfx1.o packcall.o k2grid.o packgrid.o \ packtext.o getpfx1.o packcall.o k2grid.o packgrid.o \
@ -78,6 +78,11 @@ OBJS5 = jt65.o
jt65.exe: $(OBJS5) libjt9.a jt65.exe: $(OBJS5) libjt9.a
$(FC) -o jt65.exe $(OBJS5) libjt9.a ../libfftw3f_win.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 sync9.o: sync9.f90 jt9sync.f90
$(FC) $(FFLAGS) -c sync9.f90 $(FC) $(FFLAGS) -c sync9.f90

9
lib/Makefile.linux
View File

@ -22,9 +22,9 @@ CFLAGS = -I. -fbounds-check -fPIE
%.o: %.F90 %.o: %.F90
${FC} ${FFLAGS} -c $< ${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 \ unpackmsg.o igray.o unpackcall.o unpackgrid.o \
grid2k.o unpacktext.o getpfx2.o packmsg.o deg2grid.o \ grid2k.o unpacktext.o getpfx2.o packmsg.o deg2grid.o \
packtext.o getpfx1.o packcall.o k2grid.o packgrid.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 $(FC) -o jt9code $(OBJS4) -L. -ljt9
cp jt9code $(EXE_DIR) 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 sync9.o: sync9.f90 jt9sync.f90
$(FC) $(FFLAGS) -c sync9.f90 $(FC) $(FFLAGS) -c sync9.f90

2
mainwindow.cpp
View File

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