Add multistresstest.exe target to makefile.vc

OSGeo · Jul 9, 2015 · d895a12 · d895a12
1 parent 2b5b979
commit d895a12
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/makefile.vc b/src/makefile.vc
@@ -63,11 +63,13 @@ LIBOBJ	=	$(support) $(pseudo) $(azimuthal) $(conic) $(cylinder) $(misc) \
 PROJEXE_OBJ	= proj.obj gen_cheb.obj p_series.obj emess.obj
 CS2CSEXE_OBJ	= cs2cs.obj gen_cheb.obj p_series.obj emess.obj
 GEODEXE_OBJ	= geod.obj geod_set.obj geod_interface.obj emess.obj
+MULTISTRESSTEST_OBJ = multistresstest.obj
 PROJ_DLL 	= proj$(VERSION).dll
 PROJ_EXE    = proj.exe
 CS2CS_EXE   = cs2cs.exe
 GEOD_EXE    = geod.exe
 NAD2BIN_EXE = nad2bin.exe
+MULTISTRESSTEST_EXE = multistresstest.exe
 
 CFLAGS	=	/nologo -I. -DPROJ_LIB=\"$(PROJ_LIB_DIR)\" \
 		-DHAVE_STRERROR=1 -DHAVE_LOCALECONV=1 $(OPTFLAGS)
@@ -102,6 +104,10 @@ $(GEOD_EXE):	$(GEODEXE_OBJ) $(EXE_PROJ)
 $(NAD2BIN_EXE):	nad2bin.obj emess.obj $(EXE_PROJ)
 	cl nad2bin.obj emess.obj $(EXE_PROJ)
 
+$(MULTISTRESSTEST_EXE): $(MULTISTRESSTEST_OBJ)
+	cl $(MULTISTRESSTEST_OBJ) $(EXE_PROJ)
+	if exist $(MULTISTRESSTEST_EXE).manifest mt -manifest $(MULTISTRESSTEST_EXE).manifest -outputresource:$(MULTISTRESSTEST_EXE);1
+
 nadshift:	nad2bin.exe
 	cd ..\nad
 	..\src\nad2bin.exe < conus.lla conus

diff --git a/src/multistresstest.c b/src/multistresstest.c
@@ -222,9 +222,11 @@ static void TestThread()
             {
                 fprintf( stderr, 
                          "Got %.15g,%.15g,%.15g\n"
-                         "Expected %.15g,%.15g,%.15g\n",
+                         "Expected %.15g,%.15g,%.15g\n"
+                         "Diff %.15g,%.15g,%.15g\n",
                          x, y, z, 
-                         test->dst_x, test->dst_y, test->dst_z );
+                         test->dst_x, test->dst_y, test->dst_z,
+                         x-test->dst_x, y-test->dst_y, z-test->dst_z);
             }
 
 #if reinit_every_iteration == 1