diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2015-07-09 15:34:28 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2015-07-09 15:34:28 +0200 |
| commit | d895a12eee04c04a254f2a5a759f763e2fc28519 (patch) | |
| tree | 712a1fcd6c06a76b02e287b5865a138065b9b1cc /src | |
| parent | 2b5b97942016c2f18a0992b934d1b6b460391dac (diff) | |
| download | PROJ-d895a12eee04c04a254f2a5a759f763e2fc28519.tar.gz PROJ-d895a12eee04c04a254f2a5a759f763e2fc28519.zip | |
Add multistresstest.exe target to makefile.vc
Diffstat (limited to 'src')
| -rw-r--r-- | src/makefile.vc | 6 | ||||
| -rw-r--r-- | src/multistresstest.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/makefile.vc b/src/makefile.vc index 4a47f045..41b7dca8 100644 --- 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 index 8ad35e31..d9c9aea0 100644 --- 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 |