=================================================================== RCS file: /home/cvs/OpenXM_contrib2/windows/engine2000/Makefile.vc,v retrieving revision 1.8 retrieving revision 1.15 diff -u -p -r1.8 -r1.15 --- OpenXM_contrib2/windows/engine2000/Makefile.vc 2009/03/18 05:14:22 1.8 +++ OpenXM_contrib2/windows/engine2000/Makefile.vc 2014/03/25 20:14:07 1.15 @@ -1,4 +1,4 @@ -## $OpenXM: OpenXM_contrib2/windows/engine2000/Makefile.vc,v 1.7 2009/03/17 14:58:23 ohara Exp $ +## $OpenXM: OpenXM_contrib2/windows/engine2000/Makefile.vc,v 1.14 2013/11/10 16:18:36 ohara Exp $ ## Makefile for Visual Studio 2008 SRCDIR=..\..\asir2000 @@ -9,11 +9,19 @@ PARIDIR=..\pari20 PARIINC= -I $(PARIDIR)\win32 PARILIB=$(PARIDIR)\libpari.lib -GCDIR= ..\gc-7.1 +GCDIR= ..\gc-7.2 GCLIB= $(GCDIR)\gc.lib -INCLUDES= -I $(SRCDIR)\include -I $(SRCDIR)\parse -I $(SRCDIR)\plot $(PARIINC) -DEFS= -D NDEBUG -D _MBCS -D VISUAL $(PARIDEF) +GMPDIR= ..\mpir +GMPINC= -I $(GMPDIR) +!if "$(ARCH)" == "AMD64" +GMPLIB= $(GMPDIR)\x64\mpir.lib +!else +GMPLIB= $(GMPDIR)\win32\mpir.lib +!endif + +INCLUDES= $(PARIINC) $(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 $(PARIDEF) CFLAGS= -nologo -MT -W3 -EHsc -Ox $(DEFS) $(INCLUDES) CPPFLAGS = $(CFLAGS) @@ -21,7 +29,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 -nodefaultlib:libcmt.lib $(ASIRLIB) $(PARILIB) $(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 \ @@ -32,7 +40,7 @@ VPATH=$(SRCDIR)\plot;$(SRCDIR)\io all: engine.exe clean: - -@del *.obj + -@del /q *.obj -@del engine2000.res distclean: clean