From 190e37dbfb0fbd8d766f8ede72bc04355824b3b7 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Sat, 16 Jan 2010 15:00:54 +0000 Subject: [PATCH] Compiles and runs OK on PHY-JTAYLOR, with Win7 and MinGW/g95. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@1761 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- Makefile.MinGW | 6 +++--- map65.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.MinGW b/Makefile.MinGW index fbf25f8ae..800b866f6 100644 --- a/Makefile.MinGW +++ b/Makefile.MinGW @@ -19,7 +19,7 @@ SRCF90 = a2d.f90 astro0.f90 audio_init.f90 azdist0.f90 \ runqqq.f90 fivehz.f90 flushqqq.f90 \ rfile.f90 rfile3a.F90 spec.f90 map65a.F90 display.F90 \ getfile.f90 getfile2.f90 recvpkt.f90 savetf2.F90 \ - symspec.f90 sec_midn.F90 getdphi.f90 thnix.f90 + symspec.f90 sec_midn.F90 getdphi.f90 thnix.f90 four2a.f90 SRCCOM = datcom.f90 gcom1.f90 gcom2.f90 gcom3.f90 gcom4.f90 spcom.f90 @@ -35,7 +35,7 @@ SRCF77 = indexx.f gen65.f chkmsg.f \ ccf65.f trimlist.f chkhist.f decode1a.f f77_wisdom.f \ fil6521.f twkfreq.f decode65b.f afc65b.f fchisq.f ccf2.f -SRC2F77 = four2a.f filbig.f +SRC2F77 = filbig.f SRCS2C = ptt.c igray.c wrapkarn.c cutil.c start_portaudio.c fthread.c @@ -49,7 +49,7 @@ Audio.pyd: $(OBJC1) $(OBJF77) $(SRCF90) $(SRC2F77) $(SRCS2C) $(SRCCOM) Makefile --quiet --fcompiler=g95 \ --opt="-fbounds-check -O2 -cpp -DUSE_PORTAUDIO" \ --compiler=mingw32 \ - $(OBJC1) $(OBJF77) libfftw3f.a \ + $(OBJC1) $(OBJF77) libfftw3f_win.a \ libportaudio.a libpthreadGC2.a -lwinmm -lws2_32 \ -m Audio \ only: $(F2PYONLY) : \ diff --git a/map65.py b/map65.py index 3c1a0a6e3..a63b5c3a7 100644 --- a/map65.py +++ b/map65.py @@ -1,4 +1,4 @@ -#-------------------------------------------------------------------- MAP65 +#--------------------------------------------------------------------- MAP65 # $Date$ $Revision$ # from Tkinter import *