===================================================================
RCS file: /home/cvs/OpenXM_contrib2/windows/engine2000/Makefile.vc,v
retrieving revision 1.4
retrieving revision 1.11
diff -u -p -r1.4 -r1.11
--- OpenXM_contrib2/windows/engine2000/Makefile.vc	2009/03/10 20:21:35	1.4
+++ OpenXM_contrib2/windows/engine2000/Makefile.vc	2011/02/07 06:15:23	1.11
@@ -1,29 +1,19 @@
-## $OpenXM: OpenXM_contrib2/windows/engine2000/Makefile.vc,v 1.3 2009/03/10 16:45:29 ohara Exp $
+## $OpenXM: OpenXM_contrib2/windows/engine2000/Makefile.vc,v 1.10 2011/02/04 09:45:48 ohara Exp $
 ## Makefile for Visual Studio 2008
 
 SRCDIR=..\..\asir2000
 ASIRLIB=..\asir2000lib\asir2000lib.lib
 
-!if "$(WITH_PARI)" == "no"
-
-PARIDEF=
-PARIINC=
-PARILIB=
-
-!else
-
 PARIDEF= -D PARI
 PARIDIR=..\pari20
 PARIINC= -I $(PARIDIR)\win32
 PARILIB=$(PARIDIR)\libpari.lib
 
-!endif
-
 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)
+DEFS= -D NDEBUG -D VISUAL -D _MBCS -D _CRT_SECURE_NO_WARNINGS -D _CRT_NONSTDC_NO_WARNINGS $(PARIDEF)
 CFLAGS= -nologo -MT -W3 -EHsc -Ox $(DEFS) $(INCLUDES)
 CPPFLAGS = $(CFLAGS)
 
@@ -31,8 +21,7 @@ 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 /incremental:no $(ASIRLIB) $(PARILIB) $(GCLIB) ws2_32.lib user32.lib
+LDFLAGS=-nologo -stack:0x10000000 -subsystem:windows -incremental:no -nodefaultlib:libcmt.lib $(ASIRLIB) $(PARILIB) $(GCLIB) 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 \
@@ -50,7 +39,7 @@ distclean: clean
 	-@del engine.exe
 
 engine.exe: $(OBJS)
-    $(LD) $(LDFLAGS) /out:$@ $(OBJS)
+    $(LD) $(LDFLAGS) -out:$@ $**
 
 calc.obj: {$(VPATH)}calc.c
 	$(CC) -c $(CFLAGS) $**