w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-06-25 06:35:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Accommodate some gfortran changes after upgrade to Ubuntu 12.04.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@3119 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-04-02 15:36:33 +00:00
parent 9390a7d19d
commit f27c560cf6
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libm65/m65a.F90
View File

@ -1,18 +1,14 @@
subroutine m65a subroutine m65a
! NB: this interface block is required by g95, but must be omitted
! for gfortran. (????)
#ifndef UNIX
interface interface
function address_m65() function address_m65()
integer*1, pointer :: address_m65
end function address_m65 end function address_m65
end interface end interface
#endif
integer*1 attach_m65,lock_m65,unlock_m65 integer*1 attach_m65,lock_m65,unlock_m65
integer size_m65 integer size_m65
integer*1, pointer :: address_m65,p_m65 integer*1, pointer :: p_m65
character*80 cwd character*80 cwd
logical fileExists logical fileExists
common/tracer/limtrace,lu common/tracer/limtrace,lu

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"
#include "devsetup.h" #include "devsetup.h"

6
map65.pro
View File

@ -53,11 +53,9 @@ FORMS += mainwindow.ui about.ui devsetup.ui widegraph.ui \
RC_FILE = map65.rc RC_FILE = map65.rc
unix { unix {
INCLUDEPATH += $$quote(/usr/include/qwt-qt4) INCLUDEPATH += -lqwt
LIBS += -lfftw3f /usr/lib/libgfortran.so.3
LIBS += ../map65/libm65/libm65.a LIBS += ../map65/libm65/libm65.a
LIBS += /usr/lib/libqwt-qt4.so LIBS += -lfftw3f -lportaudio -lgfortran
LIBS += -lportaudio
#LIBS +- -lusb #LIBS +- -lusb
} }