diff --git a/mainwindow.cpp b/mainwindow.cpp index d6c21a394..4c03d5c3c 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//--------------------------------------------------------- MainWindow +//-------------------------------------------------------- MainWindow #include "mainwindow.h" diff --git a/wsjtx.pro b/wsjtx.pro index b85c56b6f..76e59855f 100644 --- a/wsjtx.pro +++ b/wsjtx.pro @@ -10,13 +10,19 @@ CONFIG += thread #CONFIG += console TARGET = wsjtx -DESTDIR = ../wsjtx_install VERSION = 1.4 TEMPLATE = app DEFINES = QT5 -HAMLIB_DIR = ../../hamlib3/mingw32 QMAKE_CXXFLAGS += -std=c++11 +isEmpty (DESTDIR) { +DESTDIR = ../wsjtx_install +} + +isEmpty (HAMLIB_DIR) { +HAMLIB_DIR = ../../hamlib3/mingw32 +} + F90 = gfortran gfortran.output = ${QMAKE_FILE_BASE}.o gfortran.commands = $$F90 -c -O2 -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME} @@ -119,7 +125,7 @@ LIBS += -lfftw3f $$system($$F90 -print-file-name=libgfortran.so) win32 { INCLUDEPATH += $${HAMLIB_DIR}/include -LIBS += -L${HAMLIB_DIR}/lib -lhamlib +LIBS += -L$${HAMLIB_DIR}/lib -lhamlib LIBS += -L./lib -lastro -ljt9 LIBS += -L. -lfftw3f_win LIBS += -lws2_32