=================================================================== RCS file: /home/cvs/OpenXM_contrib2/windows/engine2000/Attic/Makefile.vc6,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- OpenXM_contrib2/windows/engine2000/Attic/Makefile.vc6 2009/03/10 16:45:29 1.3 +++ OpenXM_contrib2/windows/engine2000/Attic/Makefile.vc6 2009/03/10 20:21:35 1.4 @@ -1,10 +1,10 @@ -## $OpenXM: OpenXM_contrib2/windows/engine2000/Makefile.vc6,v 1.2 2009/03/10 16:26:12 ohara Exp $ +## $OpenXM: OpenXM_contrib2/windows/engine2000/Makefile.vc6,v 1.3 2009/03/10 16:45:29 ohara Exp $ ## Makefile for Visual C++ 6.0 SRCDIR=..\..\asir2000 ASIRLIB=..\asir2000lib\asir2000lib.lib -!if "$(WITH_PARI)" == "no" +!if "$(WITH_PARI)" == "no" PARIDEF= PARIINC= @@ -14,13 +14,13 @@ PARILIB= PARIDEF= -D PARI PARIDIR=..\pari20 -PARIINC= -I $(PARIDIR)\win32com +PARIINC= -I $(PARIDIR)\win32 PARILIB=$(PARIDIR)\libpari.lib !endif -INCLUDES = -I $(SRCDIR)\include -I $(SRCDIR)\parse -I $(SRCDIR)\plot $(PARIINC) -DEFS = -D NDEBUG -D WIN32 -D _WINDOWS -D _MBCS -D VISUAL $(PARIDEF) +INCLUDES= -I $(SRCDIR)\include -I $(SRCDIR)\parse -I $(SRCDIR)\plot $(PARIINC) +DEFS= -D NDEBUG -D WIN32 -D _WINDOWS -D _MBCS -D VISUAL $(PARIDEF) CFLAGS= -nologo -MT -W3 -EHsc -Ox $(DEFS) $(INCLUDES) CPPFLAGS = $(CFLAGS) @@ -32,7 +32,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