=================================================================== RCS file: /home/cvs/OpenXM_contrib2/windows/engine2000/Makefile.vc,v retrieving revision 1.2 retrieving revision 1.6 diff -u -p -r1.2 -r1.6 --- OpenXM_contrib2/windows/engine2000/Makefile.vc 2009/03/10 16:26:12 1.2 +++ OpenXM_contrib2/windows/engine2000/Makefile.vc 2009/03/11 10:34:22 1.6 @@ -1,10 +1,10 @@ -## $OpenXM: OpenXM_contrib2/windows/engine2000/Makefile.vc,v 1.1 2009/03/09 16:00:42 ohara Exp $ +## $OpenXM: OpenXM_contrib2/windows/engine2000/Makefile.vc,v 1.5 2009/03/11 09:52:06 ohara Exp $ ## Makefile for Visual Studio 2008 SRCDIR=..\..\asir2000 ASIRLIB=..\asir2000lib\asir2000lib.lib -!if "$(WITH_PARI)" == "no" +!if "$(WITH_PARI)" == "no" PARIDEF= PARIINC= @@ -14,7 +14,7 @@ PARILIB= PARIDEF= -D PARI PARIDIR=..\pari20 -PARIINC= -I $(PARIDIR)\win32com +PARIINC= -I $(PARIDIR)\win32 PARILIB=$(PARIDIR)\libpari.lib !endif @@ -23,7 +23,7 @@ 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 -D VISUAL_LIB $(PARIDEF) +DEFS= -D NDEBUG -D WIN32 -D _WINDOWS -D _MBCS -D VISUAL $(PARIDEF) CFLAGS= -nologo -MT -W3 -EHsc -Ox $(DEFS) $(INCLUDES) CPPFLAGS = $(CFLAGS) @@ -35,7 +35,7 @@ LDFLAGS=/nologo /stack:0x10000000 /subsystem:windows / 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 VPATH=$(SRCDIR)\plot;$(SRCDIR)\io