===================================================================
RCS file: /home/cvs/OpenXM_contrib2/windows/asir2000lib/Makefile.vc,v
retrieving revision 1.15
retrieving revision 1.17
diff -u -p -r1.15 -r1.17
--- OpenXM_contrib2/windows/asir2000lib/Makefile.vc	2015/08/13 13:45:26	1.15
+++ OpenXM_contrib2/windows/asir2000lib/Makefile.vc	2015/08/25 22:23:56	1.17
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM_contrib2/windows/asir2000lib/Makefile.vc,v 1.14 2014/03/25 20:14:07 ohara Exp $
+## $OpenXM: OpenXM_contrib2/windows/asir2000lib/Makefile.vc,v 1.16 2015/08/20 17:44:35 ohara Exp $
 ## Makefile for Visual Studio 2008
 
 !if "$(ARCH)" == ""
@@ -7,8 +7,10 @@ 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
@@ -16,9 +18,6 @@ SRCDIR=..\..\asir2000
 GCDIR= ..\gc
 GCINC = -I $(GCDIR)\include
 
-GMPDIR= ..\mpir
-GMPINC= -I $(GMPDIR)
-
 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)
@@ -37,7 +36,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 \
-  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 \