=================================================================== RCS file: /home/cvs/OpenXM_contrib2/windows/engine2000/Makefile.vc,v retrieving revision 1.17 retrieving revision 1.20 diff -u -p -r1.17 -r1.20 --- OpenXM_contrib2/windows/engine2000/Makefile.vc 2015/08/13 13:45:26 1.17 +++ OpenXM_contrib2/windows/engine2000/Makefile.vc 2016/03/30 18:37:49 1.20 @@ -1,4 +1,4 @@ -## $OpenXM: OpenXM_contrib2/windows/engine2000/Makefile.vc,v 1.16 2015/03/07 03:56:02 ohara Exp $ +## $OpenXM: OpenXM_contrib2/windows/engine2000/Makefile.vc,v 1.19 2015/08/25 22:23:56 ohara Exp $ ## Makefile for Visual Studio 2008 SRCDIR=..\..\asir2000 @@ -7,16 +7,16 @@ ASIRLIB=..\asir2000lib\asir2000lib.lib GCDIR= ..\gc GCLIB= $(GCDIR)\gc.lib -GMPDIR= ..\mpir -GMPINC= -I $(GMPDIR) !if "$(ARCH)" == "AMD64" -GMPLIB= $(GMPDIR)\x64\mpir.lib $(GMPDIR)\x64\mpfr.lib +GMPDIR= ..\mpir\x64 !else -GMPLIB= $(GMPDIR)\win32\mpir.lib $(GMPDIR)\win32\mpfr.lib +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 _MBCS -D _CRT_SECURE_NO_WARNINGS -D _CRT_NONSTDC_NO_WARNINGS +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) @@ -28,7 +28,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 if_canvas.obj VPATH=$(SRCDIR)\plot;$(SRCDIR)\io