=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.vc,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- OpenXM_contrib2/asir2000/Makefile.vc 2015/08/20 17:44:35 1.17 +++ OpenXM_contrib2/asir2000/Makefile.vc 2015/08/25 22:23:56 1.18 @@ -1,4 +1,4 @@ -## $OpenXM: OpenXM_contrib2/asir2000/Makefile.vc,v 1.16 2015/08/13 13:45:26 ohara Exp $ +## $OpenXM: OpenXM_contrib2/asir2000/Makefile.vc,v 1.17 2015/08/20 17:44:35 ohara Exp $ ## Makefile for Visual Studio 2008 !if "$(ARCH)" == "" @@ -7,10 +7,10 @@ ARCH=$(PROCESSOR_ARCHITECTURE) !if "$(ARCH)" == "AMD64" CPU_OBJ= asmalpha.obj -GMPDIR= ..\windows\gmp\x64 +GMPDIR= ..\windows\mpir\x64 !else CPU_OBJ= asmiw.obj gf2m_mul_w.obj -GMPDIR= ..\windows\gmp\win32 +GMPDIR= ..\windows\mpir\win32 !endif GCDIR= ..\windows\gc @@ -18,7 +18,7 @@ GCINC = -I $(GCDIR)\include GCLIB= $(GCDIR)\gc.lib GMPINC= -I $(GMPDIR) -GMPLIB= $(GMPDIR)\libmpc-3.lib $(GMPDIR)\libmpfr-4.lib $(GMPDIR)\libgmp-10.lib +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\" INCLUDES= $(GCINC) $(GMPINC) -I include -I parse @@ -38,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 \