w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-09-20 20:26:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update the Makefile

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2757 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2012-11-21 17:48:17 +00:00
parent d25e129756
commit d333fd9766
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Makefile.MinGW
View File

@ -5,7 +5,7 @@
CC = gcc CC = gcc
FC = g95 FC = g95
FFLAGS = -O0 -fbounds-check -Wall -Wno-precision-loss -fno-second-underscore FFLAGS = -O2 -fbounds-check -Wall -Wno-precision-loss -fno-second-underscore
CFLAGS = -I. -fbounds-check -mno-stack-arg-probe CFLAGS = -I. -fbounds-check -mno-stack-arg-probe
# Default rules # Default rules
@ -20,7 +20,7 @@ CFLAGS = -I. -fbounds-check -mno-stack-arg-probe
%.o: %.F90 %.o: %.F90
${FC} ${FFLAGS} -c $< ${FC} ${FFLAGS} -c $<
all: libjt9.a jt9sim.exe jt9.exe jt9code.exe all: libjt9.a jt9sim.exe jt9.exe jt9code.exe jt9test.exe
OBJS1 = pctile.o graycode.o sort.o ssort.o \ OBJS1 = pctile.o graycode.o sort.o ssort.o \
unpackmsg.o igray.o unpackcall.o unpackgrid.o \ unpackmsg.o igray.o unpackcall.o unpackgrid.o \
@ -37,9 +37,12 @@ libjt9.a: $(OBJS1)
ar cr libjt9.a $(OBJS1) ar cr libjt9.a $(OBJS1)
ranlib libjt9.a ranlib libjt9.a
OBJS2 = jt9.o OBJS2 = jt9.o jt9a.o ipcomm.o sleep_msec.o
LIBS2 = -L'c:/QtSDK/Desktop/Qt/4.7.4/mingw/lib' -lQtCore4
jt9.exe: $(OBJS2) libjt9.a jt9.exe: $(OBJS2) libjt9.a
$(FC) -o jt9.exe $(OBJS2) libjt9.a ../libfftw3f_win.a g++ -o jt9.exe $(OBJS2) $(LIBS2) libjt9.a ../libfftw3f_win.a \
c:/MinGW/lib/libf95.a
cp jt9.exe ../../wsjtx_install
OBJS3 = jt9sim.o OBJS3 = jt9sim.o
jt9sim.exe: $(OBJS3) libjt9.a jt9sim.exe: $(OBJS3) libjt9.a
@ -49,6 +52,10 @@ OBJS4 = jt9code.o
jt9code.exe: $(OBJS4) libjt9.a jt9code.exe: $(OBJS4) libjt9.a
$(FC) -o jt9code.exe $(OBJS4) libjt9.a $(FC) -o jt9code.exe $(OBJS4) libjt9.a
OBJS5 = jt9test.o
jt9test.exe: $(OBJS5) libjt9.a
$(FC) -o jt9test.exe $(OBJS5) libjt9.a ../libfftw3f_win.a
INCPATH = -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include/QtCore' \ INCPATH = -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include/QtCore' \
-I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include' \ -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include' \
-I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include/ActiveQt' \ -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include/ActiveQt' \
@ -87,4 +94,4 @@ sec_midn.o: sec_midn.f90
.PHONY : clean .PHONY : clean
clean: clean:
rm -f *.o libjt9.a wsjtx.exe jt9sim.exe jt9.exe t1.exe t2.exe rm -f *.o libjt9.a wsjtx.exe jt9sim.exe jt9.exe jt9test.exe

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"