===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/Attic/Makefile.vc6,v
retrieving revision 1.4
retrieving revision 1.7
diff -u -p -r1.4 -r1.7
--- OpenXM_contrib2/asir2000/Attic/Makefile.vc6	2009/03/16 16:08:05	1.4
+++ OpenXM_contrib2/asir2000/Attic/Makefile.vc6	2009/03/18 05:14:21	1.7
@@ -1,31 +1,20 @@
-## $OpenXM: OpenXM_contrib2/asir2000/Makefile.vc6,v 1.3 2009/03/10 20:21:34 ohara Exp $
+## $OpenXM: OpenXM_contrib2/asir2000/Makefile.vc6,v 1.6 2009/03/17 14:58:23 ohara Exp $
 ## Makefile for Visual C++ 6.0
 
-!if "$(WITH_PARI)" == "no" 
-
-PARIDEF=
-PARIINC=
-PARILIB=
-
-!else
-
-PARIDEF= -D PARI -D ULONG_NOT_DEFINED
+PARIDEF= -D PARI -D LONG_IS_32BIT
 PARIDIR= ..\windows\pari20
 PARIINC= -I $(PARIDIR)\win32
 PARILIB= $(PARIDIR)\libpari.lib
 
-!endif
-
 GCINC= -I gc\include
-GCDEF= -D ALL_INTERIOR_POINTERS -D LARGE_CONFIG -D DES_ENC
+GCDEF= -D ALL_INTERIOR_POINTERS -D SILENT -D WIN32
 
-DEFS = $(PARIDEF) $(GCDEF) -D NDEBUG -D VISUAL -D WIN32 -D __WIN32__ -D CONSOLE -D SILENT -D INET -D LONG_IS_32BIT -D ASIR_LIBDIR=\"c:/asir/stdlib\"
+DEFS = $(PARIDEF) $(GCDEF) -D NDEBUG -D VISUAL -D INET -D SIZEOF_LONG=4 -D ASIR_LIBDIR=\"c:/asir/stdlib\" -D DES_ENC
 INCLUDES= $(PARIINC) $(GCINC) -I include -I parse
 CFLAGS=-nologo -MT -W3 -Ox $(INCLUDES) $(DEFS)
 
 LD=link
-LDFLAGS= $(PARILIB) ws2_32.lib advapi32.lib user32.lib /nologo \
-  /stack:0x1000000 /subsystem:console /incremental:no
+LDFLAGS= -nologo -stack:0x1000000 -subsystem:console -incremental:no $(PARILIB) ws2_32.lib advapi32.lib user32.lib
 
 OBJS= _distm.obj A.obj al.obj alg.obj algnum.obj arith.obj array.obj \
   asir2000_dummy.obj asmiw.obj batch.obj bf.obj biovar.obj bload.obj \
@@ -57,7 +46,7 @@ VPATH=asm;builtin;engine;fft;io;parse;gc
 all: asir.exe
 
 asir.exe: $(OBJS) $(GC_OBJS)
-    $(LD) $(LDFLAGS) /out:$@ $**
+    $(LD) $(LDFLAGS) -out:$@ $**
 
 clean:
 	-@del *.obj