w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix several problems in wsjtx.pro, for qmake builds. 

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4140 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2014-05-14 17:43:30 +00:00
parent 747426fe3a
commit c33fe44b98
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mainwindow.cpp
View File

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

10
wsjtx.pro
View File

@ -10,12 +10,11 @@ CONFIG += thread
#CONFIG += console #CONFIG += console
TARGET = wsjtx TARGET = wsjtx
#DESTDIR = ../qt4_install
DESTDIR = ../wsjtx_install DESTDIR = ../wsjtx_install
VERSION = 1.2 VERSION = 1.4
TEMPLATE = app TEMPLATE = app
DEFINES = QT5 DEFINES = QT5
HAMLIB_DIR = ../../hamlib-1.2.15.3 HAMLIB_DIR = ../../hamlib3/mingw32
QMAKE_CXXFLAGS += -std=c++11 QMAKE_CXXFLAGS += -std=c++11
F90 = gfortran F90 = gfortran
@ -119,9 +118,8 @@ LIBS += -lfftw3f $$system($$F90 -print-file-name=libgfortran.so)
} }
win32 { win32 {
INCLUDEPATH += $(HAMLIB_DIR)/include INCLUDEPATH += $${HAMLIB_DIR}/include
LIBS += -L$(HAMLIB_DIR)/lib -lhamlib LIBS += -L${HAMLIB_DIR}/lib -lhamlib
#LIBS += -L$(HAMLIB_DIR)/lib -lhamlib
LIBS += -L./lib -lastro -ljt9 LIBS += -L./lib -lastro -ljt9
LIBS += -L. -lfftw3f_win LIBS += -L. -lfftw3f_win
LIBS += -lws2_32 LIBS += -lws2_32