=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.vc,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- OpenXM_contrib2/asir2000/Makefile.vc 2013/11/10 16:18:36 1.13 +++ OpenXM_contrib2/asir2000/Makefile.vc 2014/03/25 20:14:06 1.14 @@ -1,4 +1,4 @@ -## $OpenXM: OpenXM_contrib2/asir2000/Makefile.vc,v 1.12 2012/05/30 02:24:33 ohara Exp $ +## $OpenXM: OpenXM_contrib2/asir2000/Makefile.vc,v 1.13 2013/11/10 16:18:36 ohara Exp $ ## Makefile for Visual Studio 2008 !if "$(ARCH)" == "" @@ -20,12 +20,20 @@ GCDIR= ..\windows\gc-7.2 GCINC = -I $(GCDIR)\include GCLIB= $(GCDIR)\gc.lib +GMPDIR= ..\windows\mpir +GMPINC= -I $(GMPDIR) +!if "$(ARCH)" == "AMD64" +GMPLIB= $(GMPDIR)\x64\mpir.lib +!else +GMPLIB= $(GMPDIR)\win32\mpir.lib +!endif + DEFS = $(PARIDEF) -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= $(PARIINC) $(GCINC) -I include -I parse +INCLUDES= $(PARIINC) $(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 -incremental:no -nodefaultlib:libcmt.lib $(PARILIB) $(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 \ @@ -34,7 +42,7 @@ OBJS= _distm.obj A.obj al.obj alg.obj algnum.obj arith 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 \ @@ -300,6 +308,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