From 07807fef5111170f9adba79cbf4d164da968f71f Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Mon, 17 Jun 2024 23:22:50 -0300 Subject: [PATCH] maybe on windows --- src/Makevars.win | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/Makevars.win b/src/Makevars.win index 99debac8..6ae03f8d 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -29,15 +29,7 @@ CXX_STD = CXX17 STATLIB = s2/libs2static.a -S2LIBS = s2geography/linear-referencing.o \ - s2geography/distance.o \ - s2geography/accessors.o \ - s2geography/accessors-geog.o \ - s2geography/build.o \ - s2geography/coverings.o \ - s2geography/geography.o \ - s2geography/predicates.o \ - s2/encoded_s2cell_id_vector.o \ +S2LIBS = s2/encoded_s2cell_id_vector.o \ s2/encoded_s2point_vector.o \ s2/encoded_s2shape_index.o \ s2/encoded_string_vector.o \ @@ -61,7 +53,6 @@ S2LIBS = s2geography/linear-referencing.o \ s2/s2builderutil_s2polyline_layer.o \ s2/s2builderutil_s2polyline_vector_layer.o \ s2/s2builderutil_snap_functions.o \ - s2/s2builderutil_testing.o \ s2/s2cap.o \ s2/s2cell_id.o \ s2/s2cell_index.o \ @@ -126,19 +117,25 @@ S2LIBS = s2geography/linear-referencing.o \ s2/s2shapeutil_conversion.o \ s2/s2shapeutil_edge_iterator.o \ s2/s2shapeutil_get_reference_point.o \ - s2/s2shapeutil_testing.o \ s2/s2shapeutil_visit_crossing_edge_pairs.o \ s2/s2testing.o \ s2/s2text_format.o \ s2/s2wedge_relations.o \ s2/s2winding_operation.o \ - s2/thread_testing.o \ s2/util/bits/bit-interleave.o \ s2/util/coding/coder.o \ s2/util/coding/varint.o \ s2/util/math/exactfloat/exactfloat.o \ s2/util/math/mathutil.o \ - s2/util/units/length-units.o + s2/util/units/length-units.o \ + s2geography/linear-referencing.o \ + s2geography/distance.o \ + s2geography/accessors.o \ + s2geography/accessors-geog.o \ + s2geography/build.o \ + s2geography/coverings.o \ + s2geography/geography.o \ + s2geography/predicates.o $(SHLIB): $(STATLIB)