===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.vc,v
retrieving revision 1.16
retrieving revision 1.21
diff -u -p -r1.16 -r1.21
--- OpenXM_contrib2/asir2000/Makefile.vc	2015/08/13 13:45:26	1.16
+++ OpenXM_contrib2/asir2000/Makefile.vc	2018/09/13 19:20:47	1.21
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM_contrib2/asir2000/Makefile.vc,v 1.15 2015/03/07 03:56:02 ohara Exp $
+## $OpenXM: OpenXM_contrib2/asir2000/Makefile.vc,v 1.20 2018/09/08 02:06:09 ohara Exp $
 ## Makefile for Visual Studio 2008
 
 !if "$(ARCH)" == ""
@@ -7,28 +7,25 @@ ARCH=$(PROCESSOR_ARCHITECTURE)
 
 !if "$(ARCH)" == "AMD64"
 CPU_OBJ= asmalpha.obj
+GMPDIR= ..\windows\mpir\x64
 !else
 CPU_OBJ= asmiw.obj gf2m_mul_w.obj 
+GMPDIR= ..\windows\mpir\win32
 !endif
 
 GCDIR= ..\windows\gc
 GCINC = -I $(GCDIR)\include
 GCLIB= $(GCDIR)\gc.lib
 
-GMPDIR= ..\windows\mpir
 GMPINC= -I $(GMPDIR)
-!if "$(ARCH)" == "AMD64"
-GMPLIB= $(GMPDIR)\x64\mpir.lib $(GMPDIR)\x64\mpfr.lib
-!else
-GMPLIB= $(GMPDIR)\win32\mpir.lib $(GMPDIR)\win32\mpfr.lib
-!endif
+GMPLIB= $(GMPDIR)\mpc.lib $(GMPDIR)\mpfr.lib $(GMPDIR)\mpir.lib
 
-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\"
+DEFS = -D NDEBUG -D VISUAL -D VISUAL_CONSOLE -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 -dynamicbase:no -incremental:no -nodefaultlib:libcmt.lib $(GCLIB) $(GMPLIB) ws2_32.lib advapi32.lib user32.lib 
+LDFLAGS= -nologo -stack:0x10000000 -subsystem:console -dynamicbase:no -incremental:no $(GCLIB) $(GMPLIB) libucrt.lib ws2_32.lib advapi32.lib user32.lib version.lib setargv.obj
 
 OBJS= _distm.obj A.obj al.obj alg.obj algnum.obj arith.obj array.obj \
   asir2000_dummy.obj batch.obj bf.obj bfaux.obj biovar.obj bload.obj \
@@ -41,7 +38,7 @@ OBJS= _distm.obj A.obj al.obj alg.obj algnum.obj arith
   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 \
-  ox_asir.obj P.obj pari.obj parif.obj parser.obj PD.obj pdiv.obj PDM.obj \
+  ox_asir.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 \