=================================================================== RCS file: /home/cvs/OpenXM_contrib2/windows/pari20/Makefile.vc6,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- OpenXM_contrib2/windows/pari20/Makefile.vc6 2009/03/10 20:21:35 1.3 +++ OpenXM_contrib2/windows/pari20/Makefile.vc6 2009/03/17 13:30:28 1.4 @@ -1,17 +1,27 @@ -## $OpenXM: OpenXM_contrib2/windows/pari20/Makefile.vc6,v 1.2 2009/03/10 16:26:12 ohara Exp $ +## $OpenXM: OpenXM_contrib2/windows/pari20/Makefile.vc6,v 1.3 2009/03/10 20:21:35 ohara Exp $ ## Makefile for Visual C++ 6.0 SRCDIR= pari-2.0.17.beta\src -CFLAGS=-nologo -MT -W3 -Ox -I win32 -I $(SRCDIR)\headers -D WIN32 -D NDEBUG -D _MBCS -D _LIB +!if "$(ARCH)" == "" +ARCH=$(PROCESSOR_ARCHITECTURE) +!endif +!if "$(ARCH)" == "AMD64" +CPU_OBJ= +!else +CPU_OBJ= l0asm.obj +!endif + +CFLAGS=-nologo -MT -W3 -Ox -I win32 -I $(SRCDIR)\headers -D NDEBUG -D _MBCS + LD=link -LDFLAGS=/nologo +LDFLAGS=-nologo OBJS= alglin1.obj alglin2.obj anal.obj arith1.obj arith2.obj \ base1.obj base2.obj base3.obj base4.obj base5.obj bibli1.obj bibli2.obj \ buch1.obj buch2.obj buch3.obj buch4.obj compat.obj elliptic.obj errmsg.obj \ es.obj galconj.obj galois.obj gen1.obj gen2.obj gen3.obj helpmsg.obj \ - ifactor1.obj init.obj kummer.obj l0asm.obj mp.obj mpqs.obj nffactor.obj \ + ifactor1.obj init.obj kummer.obj mp.obj mpqs.obj nffactor.obj \ polarit1.obj polarit2.obj polarit3.obj rootpol.obj stark.obj subfield.obj \ subgroup.obj sumiter.obj thue.obj trans1.obj trans2.obj trans3.obj @@ -23,8 +33,8 @@ clean: distclean: clean -@del libpari.lib -libpari.lib: $(OBJS) - $(LD) -lib $(LDFLAGS) /out:$@ $(OBJS) +libpari.lib: $(OBJS) $(CPU_OBJ) + $(LD) -lib $(LDFLAGS) -out:$@ $** VPATH=$(SRCDIR)\basemath;$(SRCDIR)\language;$(SRCDIR)\modules;$(SRCDIR)\kernel