===================================================================
RCS file: /home/cvs/OpenXM_contrib2/windows/engine2000/Makefile.vc,v
retrieving revision 1.10
retrieving revision 1.21
diff -u -p -r1.10 -r1.21
--- OpenXM_contrib2/windows/engine2000/Makefile.vc	2011/02/04 09:45:48	1.10
+++ OpenXM_contrib2/windows/engine2000/Makefile.vc	2018/09/08 02:06:08	1.21
@@ -1,19 +1,22 @@
-## $OpenXM: OpenXM_contrib2/windows/engine2000/Makefile.vc,v 1.9 2009/03/18 05:19:43 ohara Exp $
+## $OpenXM: OpenXM_contrib2/windows/engine2000/Makefile.vc,v 1.20 2016/03/30 18:37:49 ohara Exp $
 ## Makefile for Visual Studio 2008
 
 SRCDIR=..\..\asir2000
 ASIRLIB=..\asir2000lib\asir2000lib.lib
 
-PARIDEF= -D PARI
-PARIDIR=..\pari20
-PARIINC= -I $(PARIDIR)\win32
-PARILIB=$(PARIDIR)\libpari.lib
-
-GCDIR= ..\gc-7.1
+GCDIR= ..\gc
 GCLIB= $(GCDIR)\gc.lib
 
-INCLUDES= -I $(SRCDIR)\include -I $(SRCDIR)\parse -I $(SRCDIR)\plot $(PARIINC)
-DEFS= -D NDEBUG -D VISUAL -D _MBCS -D _CRT_SECURE_NO_WARNINGS $(PARIDEF)
+!if "$(ARCH)" == "AMD64"
+GMPDIR= ..\mpir\x64
+!else
+GMPDIR= ..\mpir\win32
+!endif
+GMPINC= -I $(GMPDIR)
+GMPLIB= $(GMPDIR)\mpc.lib $(GMPDIR)\mpfr.lib $(GMPDIR)\mpir.lib
+
+INCLUDES= $(GMPINC) -I $(SRCDIR)\include -I $(SRCDIR)\parse -I $(SRCDIR)\plot
+DEFS= -D NDEBUG -D VISUAL -D VISUAL_LIB -D _MBCS -D _CRT_SECURE_NO_WARNINGS -D _CRT_NONSTDC_NO_WARNINGS
 CFLAGS= -nologo -MT -W3 -EHsc -Ox $(DEFS) $(INCLUDES)
 CPPFLAGS = $(CFLAGS)
 
@@ -21,18 +24,18 @@ RC=rc
 RFLAGS=-l 0x411 -d NDEBUG
 
 LD=link
-LDFLAGS=-nologo -stack:0x10000000 -subsystem:windows -incremental:no -nodefaultlib:libcmt.lib $(ASIRLIB) $(PARILIB) $(GCLIB) ws2_32.lib user32.lib
+LDFLAGS=-nologo -stack:0x10000000 -subsystem:windows -dynamicbase:no -incremental:no $(ASIRLIB) $(GCLIB) $(GMPLIB) ws2_32.lib user32.lib libucrt.lib setargv.obj
 
 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