From 267c852a74c2f76241966ab6701313a810e83751 Mon Sep 17 00:00:00 2001 From: Thomas Knudsen Date: Wed, 6 Apr 2016 00:30:41 +0200 Subject: Updating VS and Autotools build systems --- src/makefile.vc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/makefile.vc') diff --git a/src/makefile.vc b/src/makefile.vc index 6989519d..ffffc153 100644 --- a/src/makefile.vc +++ b/src/makefile.vc @@ -18,7 +18,7 @@ cylinder = \ 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 misc = \ PJ_airy.obj PJ_aitoff.obj PJ_august.obj PJ_bacon.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 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_init.obj pj_inv.obj \ - pj_fwd3d.obj pj_inv3d.obj \ + pj_factors.obj pj_fwd.obj pj_generic_selftest.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_strerrno.obj pj_tsfn.obj pj_units.obj \ - pj_zpoly1.obj rtodms.obj vector1.obj pj_release.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 \ 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 \ @@ -146,4 +146,4 @@ install: all copy proj_api.h $(INSTDIR)\include copy projects.h $(INSTDIR)\include copy geodesic.h $(INSTDIR)\include - + -- cgit v1.2.3 From 775f9b56ac293ec717a6deac49b33d1e3bfd81b2 Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Thu, 7 Apr 2016 12:57:45 +0200 Subject: Fixing windows build with regards to pj_run_selftests. Also adding new projections natearth2 and comill to dll-build. --- src/makefile.vc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/makefile.vc') 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 -- cgit v1.2.3 From bb88f71369d9266d322e72e9d51b4d820baf4492 Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Thu, 7 Apr 2016 13:02:17 +0200 Subject: moved test obj's to support section of makefile --- src/makefile.vc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/makefile.vc') diff --git a/src/makefile.vc b/src/makefile.vc index cd63dfdb..2efad1f0 100644 --- a/src/makefile.vc +++ b/src/makefile.vc @@ -25,8 +25,8 @@ misc = \ PJ_chamb.obj PJ_hammer.obj PJ_lagrng.obj PJ_larr.obj \ 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_qsc.obj + PJ_vandg4.obj PJ_wag7.obj pj_latlong.obj PJ_krovak.obj \ + pj_geocent.obj PJ_healpix.obj PJ_qsc.obj pseudo = \ PJ_boggs.obj PJ_collg.obj PJ_crast.obj PJ_denoy.obj \ @@ -45,7 +45,7 @@ support = \ 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_init.obj pj_inv.obj \ - pj_fwd3d.obj pj_inv3d.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_strerrno.obj pj_tsfn.obj pj_units.obj \ @@ -56,11 +56,11 @@ support = \ pj_utils.obj pj_gridlist.obj pj_gridinfo.obj \ proj_mdist.obj pj_mutex.obj pj_initcache.obj \ pj_ctx.obj pj_fileapi.obj pj_log.obj pj_apply_vgridshift.obj \ - pj_strtod.obj + pj_strtod.obj pj_run_selftests.obj pj_generic_selftest.obj geodesic = geodesic.obj LIBOBJ = $(support) $(pseudo) $(azimuthal) $(conic) $(cylinder) $(misc) \ - $(geodesic) pj_run_selftests.obj pj_generic_selftest.obj + $(geodesic) 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 -- cgit v1.2.3