=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.vc,v retrieving revision 1.7 retrieving revision 1.19 diff -u -p -r1.7 -r1.19 --- OpenXM_contrib2/asir2000/Makefile.vc 2009/03/18 05:14:21 1.7 +++ OpenXM_contrib2/asir2000/Makefile.vc 2017/08/29 07:18:30 1.19 @@ -1,4 +1,4 @@ -## $OpenXM: OpenXM_contrib2/asir2000/Makefile.vc,v 1.6 2009/03/17 14:58:23 ohara Exp $ +## $OpenXM: OpenXM_contrib2/asir2000/Makefile.vc,v 1.18 2015/08/25 22:23:56 ohara Exp $ ## Makefile for Visual Studio 2008 !if "$(ARCH)" == "" @@ -7,38 +7,38 @@ 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 -PARIDEF= -D PARI -D LONG_IS_32BIT -PARIDIR= ..\windows\pari20 -PARIINC= -I $(PARIDIR)\win32 -PARILIB= $(PARIDIR)\libpari.lib - -GCDIR= ..\windows\gc-7.1 +GCDIR= ..\windows\gc GCINC = -I $(GCDIR)\include GCLIB= $(GCDIR)\gc.lib -DEFS = $(PARIDEF) -D NDEBUG -D VISUAL -D WIN32 -D INET -D GC7 -D SIZEOF_LONG=4 -D HAVE_UNSIGNED_LONG_LONG -D ASIR_LIBDIR=\"c:/asir/stdlib\" -INCLUDES= $(PARIINC) $(GCINC) -I include -I parse +GMPINC= -I $(GMPDIR) +GMPLIB= $(GMPDIR)\mpc.lib $(GMPDIR)\mpfr.lib $(GMPDIR)\mpir.lib + +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 -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 \ - 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 \ @@ -54,7 +54,7 @@ asir.exe: $(OBJS) $(CPU_OBJ) $(LD) $(LDFLAGS) -out:$@ $** clean: - -@del *.obj + -@del /q *.obj distclean: clean -@del asir.exe @@ -86,6 +86,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) $** @@ -300,6 +303,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