=================================================================== RCS file: /home/cvs/OpenXM_contrib2/windows/engine2000/Makefile.vc,v retrieving revision 1.18 retrieving revision 1.22 diff -u -p -r1.18 -r1.22 --- OpenXM_contrib2/windows/engine2000/Makefile.vc 2015/08/20 17:44:35 1.18 +++ OpenXM_contrib2/windows/engine2000/Makefile.vc 2018/09/13 19:20:48 1.22 @@ -1,4 +1,4 @@ -## $OpenXM: OpenXM_contrib2/windows/engine2000/Makefile.vc,v 1.17 2015/08/13 13:45:26 ohara Exp $ +## $OpenXM: OpenXM_contrib2/windows/engine2000/Makefile.vc,v 1.21 2018/09/08 02:06:08 ohara Exp $ ## Makefile for Visual Studio 2008 SRCDIR=..\..\asir2000 @@ -8,15 +8,15 @@ GCDIR= ..\gc GCLIB= $(GCDIR)\gc.lib !if "$(ARCH)" == "AMD64" -GMPDIR= ..\gmp\x64 +GMPDIR= ..\mpir\x64 !else -GMPDIR= ..\gmp\win32 +GMPDIR= ..\mpir\win32 !endif GMPINC= -I $(GMPDIR) -GMPLIB= $(GMPDIR)\libmpc-3.lib $(GMPDIR)\libmpfr-4.lib $(GMPDIR)\libgmp-10.lib +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) @@ -24,7 +24,7 @@ RC=rc RFLAGS=-l 0x411 -d NDEBUG LD=link -LDFLAGS=-nologo -stack:0x10000000 -subsystem:windows -dynamicbase:no -incremental:no -nodefaultlib:libcmt.lib $(ASIRLIB) $(GCLIB) $(GMPLIB) ws2_32.lib user32.lib +LDFLAGS=-nologo -stack:0x10000000 -subsystem:windows -dynamicbase:no -incremental:no $(ASIRLIB) $(GCLIB) $(GMPLIB) ws2_32.lib user32.lib libucrt.lib version.lib setargv.obj 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 \