Fixing windows build with regards to pj_run_selftests. Also adding new projections natearth2 and comill to dll-build.

2 files changed, 99 insertions, 98 deletions

diff --git a/src/makefile.vc b/src/makefile.vc
index ffffc153..cd63dfdb 100644
--- a/src/makefile.vc
+++ b/src/makefile.vc
@@ -14,11 +14,11 @@ conic = \
 	PJ_rpoly.obj PJ_sconics.obj PJ_lcca.obj
 
 cylinder = \
-	PJ_cass.obj PJ_cc.obj PJ_cea.obj PJ_comill.obj PJ_eqc.obj \
+	PJ_cass.obj PJ_cc.obj PJ_cea.obj PJ_eqc.obj \
 	PJ_gall.obj PJ_labrd.obj PJ_lsat.obj PJ_misrsom.obj PJ_merc.obj \
 	PJ_mill.obj PJ_ocea.obj PJ_omerc.obj PJ_patterson.obj PJ_somerc.obj \
 	PJ_tcc.obj PJ_tcea.obj PJ_tmerc.obj PJ_geos.obj \
-	PJ_gstmerc.obj proj_etmerc.obj
+	PJ_gstmerc.obj proj_etmerc.obj PJ_comill.obj
 
 misc = \
 	PJ_airy.obj PJ_aitoff.obj PJ_august.obj PJ_bacon.obj \
@@ -26,7 +26,7 @@ misc = \
 	PJ_lask.obj PJ_nocol.obj PJ_ob_tran.obj PJ_oea.obj \
 	PJ_sch.obj PJ_tpeqd.obj PJ_vandg.obj PJ_vandg2.obj \
         PJ_vandg4.obj PJ_wag7.obj pj_latlong.obj PJ_krovak.obj \
-        pj_geocent.obj PJ_healpix.obj PJ_natearth.obj PJ_natearth2.obj PJ_qsc.obj
+        pj_geocent.obj PJ_healpix.obj PJ_qsc.obj
 
 pseudo = \
 	PJ_boggs.obj PJ_collg.obj PJ_crast.obj PJ_denoy.obj \
@@ -38,18 +38,18 @@ pseudo = \
 	PJ_putp4p.obj PJ_putp5.obj PJ_putp6.obj PJ_robin.obj \
 	PJ_sts.obj PJ_urm5.obj PJ_urmfps.obj PJ_wag2.obj \
 	PJ_wag3.obj PJ_wink1.obj PJ_wink2.obj PJ_isea.obj \
-	PJ_calcofi.obj
+	PJ_calcofi.obj PJ_natearth.obj PJ_natearth2.obj
 
 support = \
 	aasincos.obj adjlon.obj bch2bps.obj bchgen.obj pj_gauss.obj \
 	biveval.obj dmstor.obj mk_cheby.obj pj_auth.obj \
 	pj_deriv.obj pj_ell_set.obj pj_ellps.obj pj_errno.obj \
-	pj_factors.obj pj_fwd.obj pj_generic_selftest.obj pj_init.obj \
-	pj_inv.obj pj_fwd3d.obj pj_inv3d.obj \
+	pj_factors.obj pj_fwd.obj pj_init.obj pj_inv.obj \
+        pj_fwd3d.obj pj_inv3d.obj \
 	pj_list.obj pj_malloc.obj pj_mlfn.obj pj_msfn.obj \
 	pj_open_lib.obj pj_param.obj pj_phi2.obj pj_pr_list.obj \
-	pj_qsfn.obj pj_run_selftests.obj pj_strerrno.obj pj_tsfn.obj \
-	pj_units.obj pj_zpoly1.obj rtodms.obj vector1.obj pj_release.obj \
+	pj_qsfn.obj pj_strerrno.obj pj_tsfn.obj pj_units.obj \
+	pj_zpoly1.obj rtodms.obj vector1.obj pj_release.obj \
 	geocent.obj pj_transform.obj pj_datum_set.obj pj_datums.obj \
 	pj_apply_gridshift.obj pj_gc_reader.obj pj_gridcatalog.obj \
 	nad_cvt.obj nad_init.obj nad_intr.obj \
@@ -60,7 +60,7 @@ support = \
 
 geodesic = geodesic.obj
 LIBOBJ	=	$(support) $(pseudo) $(azimuthal) $(conic) $(cylinder) $(misc) \
-	$(geodesic)
+	$(geodesic) pj_run_selftests.obj pj_generic_selftest.obj
 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
diff --git a/src/proj.def b/src/proj.def
index c7708cc5..1f228a6c 100644
--- a/src/proj.def
+++ b/src/proj.def
@@ -1,90 +1,91 @@
-VERSION	  1.2
+VERSION   1.2
 EXPORTS
-	pj_init			@1
-	pj_fwd			@2
-	pj_inv			@3
-	pj_free			@4
-	pj_transform		@5
-	pj_geocentric_to_geodetic @6
-	pj_geodetic_to_geocentric @7
-	pj_deallocate_grids	@8
-	pj_init_plus		@9
-	pj_latlong_from_proj	@10
-	pj_is_latlong		@11
-	pj_get_errno_ref	@12
-	pj_set_finder		@13
-	pj_strerrno		@14
-	pj_errno		@15
-	pj_get_def		@16
-	pj_dalloc		@17
-	pj_is_geocent		@18
-	pj_get_release		@19
-	pj_malloc		@20
-	pj_pr_list		@21
-	pj_compare_datums	@22
-	pj_apply_gridshift	@23
-	pj_datum_transform	@24
-	pj_set_searchpath	@25
-	dmstor			@26
-	pj_get_ellps_ref	@27
-	pj_get_datums_ref	@28
-	pj_get_units_ref	@29
-	pj_get_list_ref		@30
-	pj_get_prime_meridians_ref @31
-	rtodms			@32
-	set_rtodms		@33
-	pj_factors		@34
-	mk_cheby		@35
-	adjlon			@36
-	pj_param		@37
-	pj_ell_set		@38
-	pj_mkparam		@39
-	pj_init_ctx		@40
-	pj_init_plus_ctx	@41
-	pj_get_default_ctx	@42
-	pj_get_ctx		@43
-	pj_set_ctx		@44
-	pj_ctx_alloc		@45
-	pj_ctx_free		@46
-	pj_ctx_get_errno	@47
-	pj_ctx_set_errno	@48
-	pj_ctx_set_debug	@49
-	pj_ctx_set_logger	@50
-	pj_ctx_set_app_data	@51
-	pj_ctx_get_app_data	@52
-	pj_log			@53
-	pj_clear_initcache	@54
-	geod_init		@55
-	geod_lineinit		@56
-	geod_genposition	@57
-	geod_position		@58
-	geod_gendirect		@59
-	geod_direct		@60
-	geod_geninverse		@61
-	geod_inverse		@62
-	geod_polygonarea	@63
-	pj_get_spheroid_defn	@64
-	pj_get_default_fileapi	@65
-	pj_ctx_set_fileapi	@66
-	pj_ctx_get_fileapi	@67
-	pj_ctx_fopen		@68
-	pj_ctx_fread		@69
-	pj_ctx_ftell		@70
-	pj_ctx_fclose		@71
-	pj_open_lib		@72
-	pj_atof			@73
-	pj_strtod		@74
-	pj_fwd3d		@75
-	pj_inv3d		@76
-	geod_gensetdistance	@77
-	geod_setdistance	@78
-	geod_gendirectline	@79
-	geod_directline		@80
-	geod_inverseline	@81
-	geod_polygon_init	@82
-	geod_polygon_addedge	@83
-	geod_polygon_addpoint	@84
-	geod_polygon_compute	@85
-	geod_polygon_testedge	@86
-	geod_polygon_testpoint	@87
-	geod_polygon_clear	@88
+    pj_init                         @1
+    pj_fwd                          @2
+    pj_inv                          @3
+    pj_free                         @4
+    pj_transform                    @5
+    pj_geocentric_to_geodetic       @6
+    pj_geodetic_to_geocentric       @7
+    pj_deallocate_grids             @8
+    pj_init_plus                    @9
+    pj_latlong_from_proj            @10
+    pj_is_latlong                   @11
+    pj_get_errno_ref                @12
+    pj_set_finder                   @13
+    pj_strerrno                     @14
+    pj_errno                        @15
+    pj_get_def                      @16
+    pj_dalloc                       @17
+    pj_is_geocent                   @18
+    pj_get_release                  @19
+    pj_malloc                       @20
+    pj_pr_list                      @21
+    pj_compare_datums               @22
+    pj_apply_gridshift              @23
+    pj_datum_transform              @24
+    pj_set_searchpath               @25
+    dmstor                          @26
+    pj_get_ellps_ref                @27
+    pj_get_datums_ref               @28
+    pj_get_units_ref                @29
+    pj_get_list_ref                 @30
+    pj_get_prime_meridians_ref      @31
+    rtodms                          @32
+    set_rtodms                      @33
+    pj_factors                      @34
+    mk_cheby                        @35
+    adjlon                          @36
+    pj_param                        @37
+    pj_ell_set                      @38
+    pj_mkparam                      @39
+    pj_init_ctx                     @40
+    pj_init_plus_ctx                @41
+    pj_get_default_ctx              @42
+    pj_get_ctx                      @43
+    pj_set_ctx                      @44
+    pj_ctx_alloc                    @45
+    pj_ctx_free                     @46
+    pj_ctx_get_errno                @47
+    pj_ctx_set_errno                @48
+    pj_ctx_set_debug                @49
+    pj_ctx_set_logger               @50
+    pj_ctx_set_app_data             @51
+    pj_ctx_get_app_data             @52
+    pj_log                          @53
+    pj_clear_initcache              @54
+    geod_init                       @55
+    geod_lineinit                   @56
+    geod_genposition                @57
+    geod_position                   @58
+    geod_gendirect                  @59
+    geod_direct                     @60
+    geod_geninverse                 @61
+    geod_inverse                    @62
+    geod_polygonarea                @63
+    pj_get_spheroid_defn            @64
+    pj_get_default_fileapi          @65
+    pj_ctx_set_fileapi              @66
+    pj_ctx_get_fileapi              @67
+    pj_ctx_fopen                    @68
+    pj_ctx_fread                    @69
+    pj_ctx_ftell                    @70
+    pj_ctx_fclose                   @71
+    pj_open_lib                     @72
+    pj_atof                         @73
+    pj_strtod                       @74
+    pj_fwd3d                        @75
+    pj_inv3d                        @76
+    geod_gensetdistance             @77
+    geod_setdistance                @78
+    geod_gendirectline              @79
+    geod_directline                 @80
+    geod_inverseline                @81
+    geod_polygon_init               @82
+    geod_polygon_addedge            @83
+    geod_polygon_addpoint           @84
+    geod_polygon_compute            @85
+    geod_polygon_testedge           @86
+    geod_polygon_testpoint          @87
+    geod_polygon_clear              @88
+    pj_run_selftests                @89