===================================================================
RCS file: /home/cvs/OpenXM_contrib2/windows/asir2000lib/Makefile.vc,v
retrieving revision 1.6
retrieving revision 1.19
diff -u -p -r1.6 -r1.19
--- OpenXM_contrib2/windows/asir2000lib/Makefile.vc	2009/03/17 14:58:23	1.6
+++ OpenXM_contrib2/windows/asir2000lib/Makefile.vc	2020/02/02 05:24:44	1.19
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM_contrib2/windows/asir2000lib/Makefile.vc,v 1.5 2009/03/16 16:43:03 ohara Exp $
+## $OpenXM: OpenXM_contrib2/windows/asir2000lib/Makefile.vc,v 1.18 2019/03/28 08:03:07 ohara Exp $
 ## Makefile for Visual Studio 2008
 
 !if "$(ARCH)" == ""
@@ -7,47 +7,36 @@ ARCH=$(PROCESSOR_ARCHITECTURE)
 
 !if "$(ARCH)" == "AMD64"
 CPU_OBJ= asmalpha.obj
+GMPINC= -I ..\mpir\x64
 !else
 CPU_OBJ= asmiw.obj gf2m_mul_w.obj 
+GMPINC= -I ..\mpir\win32
 !endif
 
-SRCDIR=..\..\asir2000
+SRCDIR=..\..\asir2018
 
-!if "$(WITH_PARI)" == "no"
-
-PARIDEF=
-PARIINC=
-
-!else
-
-PARIDEF= -D PARI -D ULONG_NOT_DEFINED -D LONG_IS_32BIT
-PARIDIR= ..\pari20
-PARIINC= -I $(PARIDIR)\win32
-
-!endif
-
-GCDIR= ..\gc-7.1
+GCDIR= ..\..\asir-gc\gc
 GCINC = -I $(GCDIR)\include
 
-DEFS = $(PARIDEF) -D NDEBUG -D VISUAL -D INET -D SIZEOF_LONG=4 -D HAVE_UNSIGNED_LONG_LONG -D ASIR_LIBDIR=\"c:/asir/stdlib\" -D _MBCS -D DO_PLOT -D VISUAL_LIB -D KAN=0 -D READLINE=0 -D REMOTE=0
-INCLUDES = $(PARIINC) $(GCINC) -I $(SRCDIR)\include -I $(SRCDIR)\parse -I $(SRCDIR)\plot 
+DEFS = -D NDEBUG -D VISUAL -D _MBCS -D _CRT_SECURE_NO_WARNINGS -D _CRT_NONSTDC_NO_WARNINGS -D INET -D GC7 -D SIZEOF_LONG=4 -D HAVE_UNSIGNED_LONG_LONG -D ASIR_LIBDIR=\"c:/asir/stdlib\" -D DO_PLOT -D VISUAL_LIB -D KAN=0 -D READLINE=0 -D REMOTE=0
+INCLUDES = $(GCINC) $(GMPINC) -I $(SRCDIR)\include -I $(SRCDIR)\parse -I $(SRCDIR)\plot 
 CFLAGS=-nologo -MT -W3 -Ox $(INCLUDES) $(DEFS)
 
 LD=link
 LDFLAGS=-nologo
 
 OBJS= _distm.obj A.obj al.obj alg.obj algnum.obj arith.obj array.obj \
-  asir_lib.obj batch.obj bf.obj biovar.obj bload.obj \
+  batch.obj bf.obj bfaux.obj biovar.obj bload.obj \
   bsave.obj C.obj cio.obj comp.obj compobj.obj cpexpr.obj cplx.obj \
   cplxnum.obj cpp.obj ctrl.obj D.obj dalg.obj ddM.obj ddN.obj debug.obj \
   des.obj dft.obj dist.obj distm.obj dp-supp.obj dp.obj E.obj Ebug.obj \
   ec.obj eval.obj evall.obj EZ.obj F.obj fctr.obj fft_primes.obj Fgfs.obj \
   file.obj ftab.obj function.obj gc_risa.obj gf.obj gf2n.obj \
-  gfpn.obj gfs.obj gfspn.obj glob.obj gr.obj H.obj help.obj Hgfs.obj \
+  gfpn.obj gfs.obj gfspn.obj glob.obj gmpq.obj gr.obj H.obj help.obj Hgfs.obj \
   iarray.obj init.obj int.obj io.obj kwd.obj lex.obj list.obj lmi.obj \
   load.obj M.obj main.obj mat.obj math.obj mattran.obj Mgfs.obj mi.obj \
   miscf.obj mt19937.obj N.obj nd.obj NEZ.obj num.obj numerical.obj ox.obj \
-  P.obj pari.obj parif.obj parser.obj PD.obj pdiv.obj PDM.obj \
+  P.obj parif.obj parser.obj PD.obj pdiv.obj PDM.obj \
   pexpr.obj pf.obj PM.obj polmul.obj poly.obj print.obj PU.obj PUM.obj \
   puref.obj pvar.obj Q.obj QM.obj quote.obj R.obj rat.obj real.obj \
   reduct.obj result.obj round.obj RU.obj sha1.obj sio.obj spexpr.obj \
@@ -60,7 +49,7 @@ VPATH=$(SRCDIR)\asm;$(SRCDIR)\builtin;$(SRCDIR)\engine
 all: asir2000lib.lib
 
 clean:
-	-@del *.obj
+	-@del /q *.obj
 
 distclean: clean
 	-@del asir2000lib.lib
@@ -95,6 +84,9 @@ array.obj: {$(VPATH)}array.c
 batch.obj: {$(VPATH)}batch.c
 	$(CC) -c $(CFLAGS) $**
 
+bfaux.obj: {$(VPATH)}bfaux.c
+	$(CC) -c $(CFLAGS) $**
+
 compobj.obj: {$(VPATH)}compobj.c
 	$(CC) -c $(CFLAGS) $**
 
@@ -311,6 +303,9 @@ gfs.obj: {$(VPATH)}gfs.c
 gfspn.obj: {$(VPATH)}gfspn.c
 	$(CC) -c $(CFLAGS) $**
 
+gmpq.obj: {$(VPATH)}gmpq.c
+	$(CC) -c $(CFLAGS) $**
+
 init.obj: {$(VPATH)}init.c
 	$(CC) -c $(CFLAGS) $**
 
@@ -405,9 +400,6 @@ ws_fileio.obj: {$(VPATH)}ws_fileio.c
 	$(CC) -c $(CFLAGS) $**
 
 arith.obj: {$(VPATH)}arith.c
-	$(CC) -c $(CFLAGS) $**
-
-asir_lib.obj: {$(VPATH)}asir_lib.c
 	$(CC) -c $(CFLAGS) $**
 
 comp.obj: {$(VPATH)}comp.c