===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.vc,v
retrieving revision 1.4
retrieving revision 1.16
diff -u -p -r1.4 -r1.16
--- OpenXM_contrib2/asir2000/Makefile.vc	2009/03/16 16:08:05	1.4
+++ OpenXM_contrib2/asir2000/Makefile.vc	2015/08/13 13:45:26	1.16
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM_contrib2/asir2000/Makefile.vc,v 1.3 2009/03/10 20:21:34 ohara Exp $
+## $OpenXM: OpenXM_contrib2/asir2000/Makefile.vc,v 1.15 2015/03/07 03:56:02 ohara Exp $
 ## Makefile for Visual Studio 2008
 
 !if "$(ARCH)" == ""
@@ -11,40 +11,33 @@ CPU_OBJ= asmalpha.obj
 CPU_OBJ= asmiw.obj gf2m_mul_w.obj 
 !endif
 
-!if "$(WITH_PARI)" == "no" 
+GCDIR= ..\windows\gc
+GCINC = -I $(GCDIR)\include
+GCLIB= $(GCDIR)\gc.lib
 
-PARIDEF=
-PARIINC=
-PARILIB=
-
+GMPDIR= ..\windows\mpir
+GMPINC= -I $(GMPDIR)
+!if "$(ARCH)" == "AMD64"
+GMPLIB= $(GMPDIR)\x64\mpir.lib $(GMPDIR)\x64\mpfr.lib
 !else
-
-PARIDEF= -D PARI -D ULONG_NOT_DEFINED
-PARIDIR= ..\windows\pari20
-PARIINC= -I $(PARIDIR)\win32
-PARILIB= $(PARIDIR)\libpari.lib
-
+GMPLIB= $(GMPDIR)\win32\mpir.lib $(GMPDIR)\win32\mpfr.lib
 !endif
 
-GCDIR= ..\windows\gc-7.1
-GCINC = -I $(GCDIR)\include
-GCLIB= $(GCDIR)\gc.lib
-
-DEFS = $(PARIDEF) -D NDEBUG -D VISUAL -D WIN32 -D __WIN32__ -D CONSOLE -D SILENT -D INET -D LONG_IS_32BIT -D HAVE_UNSIGNED_LONG_LONG -D ASIR_LIBDIR=\"c:/asir/stdlib\"
-INCLUDES= $(PARIINC) $(GCINC) -I include -I parse
+DEFS = -D NDEBUG -D VISUAL -D _CRT_SECURE_NO_WARNINGS -D _CRT_NONSTDC_NO_WARNINGS -D WIN32 -D INET -D GC7 -D SIZEOF_LONG=4 -D HAVE_UNSIGNED_LONG_LONG -D ASIR_LIBDIR=\"c:/asir/stdlib\"
+INCLUDES= $(GCINC) $(GMPINC) -I include -I parse
 CFLAGS=-nologo -MT -W3 -Ox $(INCLUDES) $(DEFS)
 
 LD=link
-LDFLAGS= /nologo /stack:0x10000000 /subsystem:console /incremental:no /nodefaultlib:libcmt.lib $(PARILIB) $(GCLIB) ws2_32.lib advapi32.lib user32.lib 
+LDFLAGS= -nologo -stack:0x10000000 -subsystem:console -dynamicbase:no -incremental:no -nodefaultlib:libcmt.lib $(GCLIB) $(GMPLIB) 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 batch.obj bf.obj biovar.obj bload.obj \
+  asir2000_dummy.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 \
@@ -61,10 +54,10 @@ VPATH=asm;builtin;engine;fft;io;parse;gc
 all: asir.exe
 
 asir.exe: $(OBJS) $(CPU_OBJ)
-    $(LD) $(LDFLAGS) /out:$@ $**
+    $(LD) $(LDFLAGS) -out:$@ $**
 
 clean:
-	-@del *.obj
+	-@del /q *.obj
 
 distclean: clean
 	-@del asir.exe
@@ -96,6 +89,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) $**
 
@@ -310,6 +306,9 @@ gfs.obj: {$(VPATH)}gfs.c
 	$(CC) -c $(CFLAGS) $**
 
 gfspn.obj: {$(VPATH)}gfspn.c
+	$(CC) -c $(CFLAGS) $**
+
+gmpq.obj: {$(VPATH)}gmpq.c
 	$(CC) -c $(CFLAGS) $**
 
 init.obj: {$(VPATH)}init.c