From d4ae09b7025484cbf01d0bf6f1952933ab798ed6 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Wed, 16 Jan 2008 16:48:00 +0000
Subject: [PATCH] Changed a Win32 conditional to CVF.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@623 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 Makefile.win => Makefile.CVF | 10 +++++-----
 jtaudio.c                    |  2 +-
 map65.py                     |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename Makefile.win => Makefile.CVF (88%)

diff --git a/Makefile.win b/Makefile.CVF
similarity index 88%
rename from Makefile.win
rename to Makefile.CVF
index 815ffcef8..6cc4345be 100644
--- a/Makefile.win
+++ b/Makefile.CVF
@@ -35,7 +35,7 @@ SRCS2F77 = indexx.f gen65.f chkmsg.f \
 	filbig.f fil659.f fil658.f fil6521.f twkfreq.f decode65b.f \
 	afc65b.f fchisq.f ccf2.f
 
-SRCS2C   = resample.c ptt.c igray.c wrapkarn.c rfile3.c wfile3.c
+SRCS2C   = resample.c ptt.c igray.c wrapkarn.c rfile3.c
 
 MAP65.EXE: Audio.pyd map65.spec
 	python c:\python23\installer\Build.py map65.spec
@@ -43,7 +43,7 @@ MAP65.EXE: Audio.pyd map65.spec
 Audio.pyd: $(OBJS2C) $(SRCS2F90) $(SRCS2F77) $(SRCS2C) $(SRCSCOM)
 	python f2py.py -c \
 	--quiet --"fcompiler=compaqv" \
-	--opt="/nologo /traceback /warn:errors /fast /fpp /define:Win32 \
+	--opt="/nologo /traceback /warn:errors /fast /fpp /define:CVF \
 	      /define:USE_PORTAUDIO" \
 	$(OBJS2C) \
 	-lwinmm -lws2_32 -lpa -lfftw3single -llibsamplerate \
@@ -56,7 +56,7 @@ map65.spec: map65.py astro.py g.py options.py palettes.py smeter.py specjt.py
 	--tk --onefile map65.py
 
 jtaudio.o: jtaudio.c
-	$(CC) /nologo /c /DWin32 /Fojtaudio.o jtaudio.c
+	$(CC) /nologo /c /DCVF /Fojtaudio.o jtaudio.c
 
 init_rs.obj: init_rs.c
 	$(CC) /nologo /c /DBIGSYM=1 init_rs.c
@@ -77,10 +77,10 @@ decode_rs.o: decode_rs.c
 	$(CC) /nologo /c /DBIGSYM=1 /Ox /Zd /Fodecode_rs.o decode_rs.c
 
 wrapkarn.obj: wrapkarn.c
-	$(CC) /nologo /c /DWin32=1 wrapkarn.c
+	$(CC) /nologo /c /DCVF=1 wrapkarn.c
 
 igray.obj: igray.c
-	$(CC) /nologo /c /DWin32=1 igray.c
+	$(CC) /nologo /c /DCVF=1 igray.c
 
 plrr_subs.o: plrr_subs_win.c
 	$(CC) /nologo /c plrr_subs_win.c /Foplrr_subs.o
diff --git a/jtaudio.c b/jtaudio.c
index 6e790c2d9..c9b8421b0 100644
--- a/jtaudio.c
+++ b/jtaudio.c
@@ -40,7 +40,7 @@ typedef struct _SYSTEMTIME
   short   Millisecond;
 } SYSTEMTIME;
 
-#ifdef Win32
+#ifdef CVF
 extern void __stdcall GetSystemTime(SYSTEMTIME *st);
 #else
 #include <sys/time.h>
diff --git a/map65.py b/map65.py
index 916358433..7f4fb508f 100644
--- a/map65.py
+++ b/map65.py
@@ -1,4 +1,4 @@
-#---------------------------------------------------------------------- MAP65
+#--------------------------------------------------------------------- MAP65
 # $Date$ $Revision$
 #
 from Tkinter import *