===================================================================
RCS file: /home/cvs/OpenXM_contrib2/windows/engine2000/Makefile.vc,v
retrieving revision 1.5
retrieving revision 1.18
diff -u -p -r1.5 -r1.18
--- OpenXM_contrib2/windows/engine2000/Makefile.vc	2009/03/11 09:52:06	1.5
+++ OpenXM_contrib2/windows/engine2000/Makefile.vc	2015/08/20 17:44:35	1.18
@@ -1,29 +1,22 @@
-## $OpenXM: OpenXM_contrib2/windows/engine2000/Makefile.vc,v 1.4 2009/03/10 20:21:35 ohara Exp $
+## $OpenXM: OpenXM_contrib2/windows/engine2000/Makefile.vc,v 1.17 2015/08/13 13:45:26 ohara Exp $
 ## Makefile for Visual Studio 2008
 
 SRCDIR=..\..\asir2000
 ASIRLIB=..\asir2000lib\asir2000lib.lib
 
-!if "$(WITH_PARI)" == "no"
+GCDIR= ..\gc
+GCLIB= $(GCDIR)\gc.lib
 
-PARIDEF=
-PARIINC=
-PARILIB=
-
+!if "$(ARCH)" == "AMD64"
+GMPDIR= ..\gmp\x64
 !else
-
-PARIDEF= -D PARI
-PARIDIR=..\pari20
-PARIINC= -I $(PARIDIR)\win32
-PARILIB=$(PARIDIR)\libpari.lib
-
+GMPDIR= ..\gmp\win32
 !endif
+GMPINC= -I $(GMPDIR)
+GMPLIB= $(GMPDIR)\libmpc-3.lib $(GMPDIR)\libmpfr-4.lib $(GMPDIR)\libgmp-10.lib
 
-GCDIR= ..\gc-7.1
-GCLIB= $(GCDIR)\gc.lib
-
-INCLUDES= -I $(SRCDIR)\include -I $(SRCDIR)\parse -I $(SRCDIR)\plot $(PARIINC)
-DEFS= -D NDEBUG -D WIN32 -D _WINDOWS -D _MBCS -D VISUAL $(PARIDEF)
+INCLUDES= $(GMPINC) -I $(SRCDIR)\include -I $(SRCDIR)\parse -I $(SRCDIR)\plot
+DEFS= -D NDEBUG -D VISUAL -D _MBCS -D _CRT_SECURE_NO_WARNINGS -D _CRT_NONSTDC_NO_WARNINGS
 CFLAGS= -nologo -MT -W3 -EHsc -Ox $(DEFS) $(INCLUDES)
 CPPFLAGS = $(CFLAGS)
 
@@ -31,25 +24,25 @@ RC=rc
 RFLAGS=-l 0x411 -d NDEBUG
 
 LD=link
-LDFLAGS=/nologo /stack:0x10000000 /subsystem:windows /incremental:no $(ASIRLIB) $(PARILIB) $(GCLIB) ws2_32.lib user32.lib
+LDFLAGS=-nologo -stack:0x10000000 -subsystem:windows -dynamicbase:no -incremental:no -nodefaultlib:libcmt.lib $(ASIRLIB) $(GCLIB) $(GMPLIB) ws2_32.lib user32.lib
 
 OBJS= engine2000.res ChildView.obj MainFrm.obj StdAfx.obj calc.obj \
   if.obj io.obj ox_asir.obj ox_launch.obj ox_plot.obj ox_plot_win.obj \
-  plot.obj plotg.obj plotp.obj
+  plot.obj plotg.obj plotp.obj if_canvas.obj
 
 VPATH=$(SRCDIR)\plot;$(SRCDIR)\io
 
 all: engine.exe
 
 clean:
-	-@del *.obj
+	-@del /q *.obj
 	-@del engine2000.res
 
 distclean: clean
 	-@del engine.exe
 
 engine.exe: $(OBJS)
-    $(LD) $(LDFLAGS) /out:$@ $(OBJS)
+    $(LD) $(LDFLAGS) -out:$@ $**
 
 calc.obj: {$(VPATH)}calc.c
 	$(CC) -c $(CFLAGS) $**