=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.vc,v retrieving revision 1.4 retrieving revision 1.13 diff -u -p -r1.4 -r1.13 --- OpenXM_contrib2/asir2000/Makefile.vc 2009/03/16 16:08:05 1.4 +++ OpenXM_contrib2/asir2000/Makefile.vc 2013/11/10 16:18:36 1.13 @@ -1,4 +1,4 @@ -## $OpenXM: OpenXM_contrib2/asir2000/Makefile.vc,v 1.3 2009/03/10 20:21:34 ohara Exp $ +## $OpenXM: OpenXM_contrib2/asir2000/Makefile.vc,v 1.12 2012/05/30 02:24:33 ohara Exp $ ## Makefile for Visual Studio 2008 !if "$(ARCH)" == "" @@ -11,31 +11,21 @@ CPU_OBJ= asmalpha.obj CPU_OBJ= asmiw.obj gf2m_mul_w.obj !endif -!if "$(WITH_PARI)" == "no" - -PARIDEF= -PARIINC= -PARILIB= - -!else - -PARIDEF= -D PARI -D ULONG_NOT_DEFINED +PARIDEF= -D PARI -D LONG_IS_32BIT PARIDIR= ..\windows\pari20 PARIINC= -I $(PARIDIR)\win32 PARILIB= $(PARIDIR)\libpari.lib -!endif - -GCDIR= ..\windows\gc-7.1 +GCDIR= ..\windows\gc-7.2 GCINC = -I $(GCDIR)\include GCLIB= $(GCDIR)\gc.lib -DEFS = $(PARIDEF) -D NDEBUG -D VISUAL -D WIN32 -D __WIN32__ -D CONSOLE -D SILENT -D INET -D LONG_IS_32BIT -D HAVE_UNSIGNED_LONG_LONG -D ASIR_LIBDIR=\"c:/asir/stdlib\" +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 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) 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 \ @@ -61,10 +51,10 @@ VPATH=asm;builtin;engine;fft;io;parse;gc all: asir.exe asir.exe: $(OBJS) $(CPU_OBJ) - $(LD) $(LDFLAGS) /out:$@ $** + $(LD) $(LDFLAGS) -out:$@ $** clean: - -@del *.obj + -@del /q *.obj distclean: clean -@del asir.exe