Adjusted the code to make it compile and run under Linux.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3074 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Edson W. R. Pereira 2013-03-23 15:35:32 +00:00
parent 377339a185
commit eefb14473a
4 changed files with 6 additions and 8 deletions

View File

@ -29,7 +29,7 @@ OBJS1 = pctile.o graycode.o sort.o ssort.o \
fil3.o redsync.o decoder.o grid2n.o n2grid.o timer.o \ fil3.o redsync.o decoder.o grid2n.o n2grid.o timer.o \
decode9a.o peakdt9.o getlags.o afc9.o fchisq.o \ decode9a.o peakdt9.o getlags.o afc9.o fchisq.o \
twkfreq.o downsam9.o symspec2.o ipcomm.o sleep_msec.o \ twkfreq.o downsam9.o symspec2.o ipcomm.o sleep_msec.o \
stdmsg.o stdmsg.o sec_midn.o cutil.o
libjt9.a: $(OBJS1) libjt9.a: $(OBJS1)
ar cr libjt9.a $(OBJS1) ar cr libjt9.a $(OBJS1)
@ -38,7 +38,7 @@ libjt9.a: $(OBJS1)
OBJS2 = jt9.o jt9a.o OBJS2 = jt9.o jt9a.o
jt9: $(OBJS2) libjt9.a jt9: $(OBJS2) libjt9.a
g++ -o jt9 $(OBJS2) -lQtCore libjt9.a -lfftw3f -lgfortran g++ -o jt9 $(OBJS2) libjt9.a -lfftw3f -lgfortran -lQtCore
cp jt9 ../../wsjtx_install cp jt9 ../../wsjtx_install
OBJS3 = jt9sim.o OBJS3 = jt9sim.o

View File

@ -3,16 +3,15 @@ subroutine jt9a
! NB: this interface block is required by g95, but must be omitted ! NB: this interface block is required by g95, but must be omitted
! for gfortran. (????) ! for gfortran. (????)
#ifndef UNIX
interface interface
function address_jt9() function address_jt9()
integer*1, pointer :: address_jt9
end function address_jt9 end function address_jt9
end interface end interface
#endif
integer*1 attach_jt9,lock_jt9,unlock_jt9 integer*1 attach_jt9,lock_jt9,unlock_jt9
integer size_jt9 integer size_jt9
integer*1, pointer :: address_jt9,p_jt9 integer*1, pointer :: p_jt9
character*80 cwd character*80 cwd
logical fileExists logical fileExists
common/tracer/limtrace,lu common/tracer/limtrace,lu

View File

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

View File

@ -56,10 +56,9 @@ RC_FILE = wsjtx.rc
unix { unix {
INCLUDEPATH += $$quote(/usr/include/qwt-qt4) INCLUDEPATH += $$quote(/usr/include/qwt-qt4)
LIBS += -lfftw3f /usr/lib/libgfortran.so.3
LIBS += ../wsjtx/lib/libjt9.a LIBS += ../wsjtx/lib/libjt9.a
LIBS += /usr/lib/libqwt-qt4.so LIBS += /usr/lib/libqwt-qt4.so
LIBS += -lportaudio LIBS += -lportaudio -lgfortran -lfftw3f
} }
win32 { win32 {