From 681f03bc7fdba9001a83a28446d4057dde86b42f Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 11 Mar 2014 13:45:27 +0000 Subject: [PATCH] Fix hard-coded path to libraries included in source directory. Fix the gfortran "read/write after EOF" problem. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@3861 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- CMakeLists.txt | 2 +- libm65/display.f90 | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 629369b76..483cb5edb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,7 +130,7 @@ add_custom_target (kvasd DEPENDS contrib/kvasd${CMAKE_EXECUTABLE_SUFFIX}) qt5_wrap_ui (GENUISRCS ${UISRCS}) add_executable (map65 ${CXXSRCS} ${CSRCS} ${GENUISRCS} map65.rc) -target_link_libraries (map65 m65impl ${fftw3f_LIBRARIES} C:/wsjt-env/src/map65/palir-02.dll C:/wsjt-env/src/map65/libusb.a C:/wsjt-env/src/map65/libwsock32.a ) +target_link_libraries (map65 m65impl ${fftw3f_LIBRARIES} ${CMAKE_CURRENT_SOURCE_DIR}/palir-02.dll ${CMAKE_CURRENT_SOURCE_DIR}/libusb.a ${CMAKE_CURRENT_SOURCE_DIR}/libwsock32.a) if (WIN32) target_link_libraries (map65) diff --git a/libm65/display.f90 b/libm65/display.f90 index 8b707850a..de121454e 100644 --- a/libm65/display.f90 +++ b/libm65/display.f90 @@ -21,7 +21,8 @@ subroutine display(nkeep,ftol) freqkHz(i)=1000.d0*(f0-144.d0) + 0.001d0*ndf enddo -10 nz=i-1 +10 backspace(26) + nz=i-1 utcz=utc(nz) nz=nz-1 if(nz.lt.1) go to 999