Commit Graph

34 Commits

Author SHA1 Message Date
Bill Somerville
4fc1ba02d2 Make/qmake tweaks
The lib/Makefile.MinGW makefile  has been enhanced to link  to the DLL
version of fftw3  which is the normal version of  the library that you
get with the Windows installer.

The library is  located by passing the FFTW3_DIR variable  on the make
command line. For example on my system:

	$ # In a MinGW console
	$ cd ~/src/wsjtx/lib
	$ make QT_DIR=/c/Tools/Qt/5.2.1/mingw48_32 \
	>  FFTW3_DIR=/c/Tools/fftw-3.3.3-dll32-2

Similarly with the qmake project:

	$ # In a Qt MinGW 32-bit console
	$ cd ~/src/wsjtx
	$ qmake \
	>  HAMLIB_DIR=c:/test-install/hamlib/mingw48_32 \
	>  FFTW3_DIR=c:/Tools/fftw-3.3.3-dll32-2
	$ mingw32-make



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4551 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-21 13:47:19 +00:00
Bill Somerville
025bfe52d6 Added recource file to qmake project file.
Made 'lib' makefiles a bit more portable.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3976 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-04-02 17:37:18 +00:00
Bill Somerville
9763127789 Add new sources to lib Makefiles.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3971 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-03-31 03:11:16 +00:00
Joe Taylor
7fe8901149 Merge changes from branches/wsjtx_w back into branches/wsjtx.
Note to developers: Not sure about the makefiles...


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3835 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-03-05 18:20:40 +00:00
Bill Somerville
aa7e790e69 Made Makefile.MinGW more generic.
For example the location of the Qt installation can be specified by
overriding the Makefile variable QT_DIR like:

mingw32-make -f Makefile.MinGW QT_DIR=C:\Qt\5.2.1\mingw48_32

the default uses the g95 Fortram compiler, if you have gfortran
installed and on the PATH then you can override the FC variable like:

mingw32-make -f Makefile.MinGW FC=gfortran



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3780 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-02-19 23:30:25 +00:00
Joe Taylor
644b39fad7 Previous commit message should also have mentioned:
5. F7 now toggles the Setup menu item "Double-click on call sets
   Tx Enable".  Present state is written to Status Bar label 3.

The present commit updates the makefiles.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3673 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-01-30 18:08:40 +00:00
Joe Taylor
ace8f6418e 1. Fix a bug that could cause decoder to hang when presented with
bad data.

2. Fix a bug that could allow a Koetter-Vardy false decode instead of
a valid Berlekamp-Massey decode, sometimes leading to program crash.

3. Many more edits in the User's Guide, *.adoc files.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3664 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-01-27 21:28:54 +00:00
Joe Taylor
6541c1da85 Fix a bug that can arise as a result of a false decode.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3660 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-01-25 16:53:34 +00:00
Joe Taylor
ed91a35847 1. Corrected handling of compound callsigns: use JT65v1 encoding if
applicable, JT65v2 otherwise.  Thanks to DL9RDZ!

2. Fix a bug in flat3.f90, evident on OSX systems.  Thanks to G4KLA!

3. The Makefile now copy the jt9code executable into the destination
   directory for to-be-packaged executables.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3648 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-01-18 13:59:19 +00:00
Joe Taylor
3bb5787225 More tweaks to the use of flat3.
Include updated makefiles.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3626 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-01-09 00:03:22 +00:00
Joe Taylor
63ff61f037 UPdate the makefiles so they will compile fil4.f90
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3581 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-09-27 15:47:34 +00:00
Joe Taylor
87ad45188f Most of these changes are thanks to G4WJS. Audio I/O is now done using
Qt's built-in QAudio calls rather than PortAudio.  Also includes some
refactoring of the arrangement for these calls, and more use of C++ style.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3523 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-05 13:57:55 +00:00
Joe Taylor
fb0b9dacfb Change Makefile.MinGW to use my qt5.0.2 paths. Yours may be different!
The old Makefile.MinGW has been renamed Makefile.MinGW.qt4.
Be sure to check settings in lines 13-19 of wsjtx.pro.

Soon to come: Permanent changeover from PortAudio to QAudio ?



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3521 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-02 19:52:25 +00:00
Joe Taylor
361e846857 Makefiles should create EXE_DIR if it does not exist.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3503 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-25 18:12:03 +00:00
Joe Taylor
8fb483a200 Merging code for v1.1 back into the main wsjtx branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3462 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-08 13:17:22 +00:00
Joe Taylor
1242cad5fc Eliminate all compiler warnings from gfortran, in Ubuntu 12.04.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3301 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-23 13:33:29 +00:00
Joe Taylor
133f8d6886 Clean up all g95 compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3299 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-23 01:05:37 +00:00
Joe Taylor
2a572896f4 Some minor code cleanup.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3298 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-22 20:21:38 +00:00
Joe Taylor
07edcb67e0 Added routine "chkss2" to test sync vector for sanity before attenpting
Fano decode.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3270 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-15 15:17:36 +00:00
Joe Taylor
0a3398a93e Gray-out the "Polling interval" control if CAT is not enabled.
UPdate Makefile.MinGW.
Much work new on User's Guide.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3251 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-02 16:19:26 +00:00
Joe Taylor
7de01309f0 Update Makefile.MinGW.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3227 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-26 16:45:11 +00:00
Joe Taylor
695ce7b83e General code clean-up to eliminate compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3198 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-22 15:08:20 +00:00
Joe Taylor
0516a86dd8 1. Tweak the DialFreq label; remove similar label from Wide Graph window.
2. Add a tab for Default Frequencies on Setup window.
3. Update Makefile.MinGW
4. Bump version number to 0.8.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3097 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-25 19:13:49 +00:00
Joe Taylor
4b719a985d Implementing uploads to PSK Reporter. (Not yet finished.)
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3043 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-11 15:51:44 +00:00
Joe Taylor
3fae9c607c Starting to implement the JT4 modes.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2966 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-01-22 19:19:00 +00:00
Joe Taylor
292a15d9c3 Permit starting jt9.exe from a directory with embedded spaces.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2785 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-11-28 21:08:35 +00:00
Joe Taylor
03a1715525 Update the Makefile
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2757 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-11-21 17:48:17 +00:00
Joe Taylor
3285497494 Save the new Makefile, with Fortran flag -O0.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2728 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-11-14 15:31:21 +00:00
Joe Taylor
0b90cfbaf1 Save new Makefile
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2689 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-10-25 13:02:38 +00:00
Joe Taylor
2a11cd7c5e Some cleanup of code and repository.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2670 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-10-17 19:58:35 +00:00
Joe Taylor
d397ed7bdf Add fil3.f90.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2654 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-10-10 19:25:28 +00:00
Joe Taylor
bb02cd3e8c Working on peakups for DF and DT.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2642 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-10-03 17:47:55 +00:00
Joe Taylor
dafae14123 More cleanup...
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2636 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-10-03 14:50:57 +00:00
Joe Taylor
a67d17316f Rename library directory
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2635 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-10-03 14:31:43 +00:00