mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-10-01 01:26:39 -04:00
Add s3avg.o to Makefile.MinGW.
Change the install directory to map65_install. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@2462 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
9e73f87218
commit
bf4914a8e2
@ -31,7 +31,7 @@ OBJS1 = trimlist.o display.o getdphi.o pctile.o ccf65.o \
|
|||||||
astro.o tm2.o sun.o moondop.o coord.o tmoonsub.o \
|
astro.o tm2.o sun.o moondop.o coord.o tmoonsub.o \
|
||||||
geocentric.o moon2.o toxyz.o dot.o dcoord.o f77_wisdom.o \
|
geocentric.o moon2.o toxyz.o dot.o dcoord.o f77_wisdom.o \
|
||||||
gen65.o chkmsg.o ptt.o astrosub.o astro0.o recvpkt.o symspec.o \
|
gen65.o chkmsg.o ptt.o astrosub.o astro0.o recvpkt.o symspec.o \
|
||||||
iqcal.o iqfix.o timf2.o
|
iqcal.o iqfix.o timf2.o s3avg.o
|
||||||
|
|
||||||
libm65.a: $(OBJS1)
|
libm65.a: $(OBJS1)
|
||||||
ar cr libm65.a $(OBJS1)
|
ar cr libm65.a $(OBJS1)
|
||||||
@ -44,7 +44,7 @@ LIBS3 = -L'c:/QtSDK/Desktop/Qt/4.7.4/mingw/lib' -lQtCore4
|
|||||||
m65.exe: $(OBJS3) libm65.a
|
m65.exe: $(OBJS3) libm65.a
|
||||||
g++ -o m65.exe $(OBJS3) $(LIBS3) libm65.a ../libfftw3f_win.a \
|
g++ -o m65.exe $(OBJS3) $(LIBS3) libm65.a ../libfftw3f_win.a \
|
||||||
c:/MinGW/lib/libf95.a
|
c:/MinGW/lib/libf95.a
|
||||||
cp m65.exe ../../install
|
cp m65.exe ../../map65_install
|
||||||
|
|
||||||
OBJS2 = JT65code.o
|
OBJS2 = JT65code.o
|
||||||
JT65code.exe: $(OBJS2) libm65.a
|
JT65code.exe: $(OBJS2) libm65.a
|
||||||
|
10
map65.pro
10
map65.pro
@ -14,7 +14,7 @@ TEMPLATE = app
|
|||||||
|
|
||||||
win32 {
|
win32 {
|
||||||
DEFINES = WIN32
|
DEFINES = WIN32
|
||||||
DESTDIR = ../install
|
DESTDIR = ../map65_install
|
||||||
F90 = g95
|
F90 = g95
|
||||||
g95.output = ${QMAKE_FILE_BASE}.o
|
g95.output = ${QMAKE_FILE_BASE}.o
|
||||||
g95.commands = $$F90 -c -O2 -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
|
g95.commands = $$F90 -c -O2 -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
|
||||||
@ -24,7 +24,7 @@ QMAKE_EXTRA_COMPILERS += g95
|
|||||||
|
|
||||||
unix {
|
unix {
|
||||||
DEFINES = UNIX
|
DEFINES = UNIX
|
||||||
DESTDIR = ../install
|
DESTDIR = ../map65_install
|
||||||
F90 = gfortran
|
F90 = gfortran
|
||||||
gfortran.output = ${QMAKE_FILE_BASE}.o
|
gfortran.output = ${QMAKE_FILE_BASE}.o
|
||||||
gfortran.commands = $$F90 -c -O2 -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
|
gfortran.commands = $$F90 -c -O2 -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
|
||||||
@ -55,7 +55,7 @@ RC_FILE = map65.rc
|
|||||||
unix {
|
unix {
|
||||||
INCLUDEPATH += $$quote(/usr/include/qwt-qt4)
|
INCLUDEPATH += $$quote(/usr/include/qwt-qt4)
|
||||||
LIBS += -lfftw3f /usr/lib/libgfortran.so.3
|
LIBS += -lfftw3f /usr/lib/libgfortran.so.3
|
||||||
LIBS += ../trunk/libm65/libm65.a
|
LIBS += ../map65/libm65/libm65.a
|
||||||
LIBS += /usr/lib/libqwt-qt4.so
|
LIBS += /usr/lib/libqwt-qt4.so
|
||||||
LIBS += -lportaudio
|
LIBS += -lportaudio
|
||||||
#LIBS +- -lusb
|
#LIBS +- -lusb
|
||||||
@ -63,8 +63,8 @@ LIBS += -lportaudio
|
|||||||
|
|
||||||
win32 {
|
win32 {
|
||||||
INCLUDEPATH += c:/qwt-6.0.1/include
|
INCLUDEPATH += c:/qwt-6.0.1/include
|
||||||
LIBS += ../trunk/libm65/libm65.a
|
LIBS += ../map65/libm65/libm65.a
|
||||||
LIBS += ../trunk/libfftw3f_win.a
|
LIBS += ../map65/libfftw3f_win.a
|
||||||
LIBS += ../QtSupport/palir-02.dll
|
LIBS += ../QtSupport/palir-02.dll
|
||||||
LIBS += libwsock32
|
LIBS += libwsock32
|
||||||
LIBS += C:/MinGW/lib/libf95.a
|
LIBS += C:/MinGW/lib/libf95.a
|
||||||
|
Loading…
Reference in New Issue
Block a user