stop pretending that there will be a C API

r-spatial · Apr 21, 2022 · 3d33c13 · 3d33c13
1 parent 7c8e602
commit 3d33c13
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 35 deletions.
diff --git a/src/Makevars.in b/src/Makevars.in
@@ -103,8 +103,7 @@ OBJECTS = $(ABSL_LIBS) \
      s2-xptr.o \
      wk-impl.o \
      wk-c-utils.o \
-     s2-geography/capi/tessellator.o \
-     s2-geography/capi/status.o \
+     tessellator.o \
      s2-geography/accessors.o \
      s2-geography/accessors-geog.o \
      s2-geography/linear-referencing.o \

diff --git a/src/Makevars.win b/src/Makevars.win
@@ -88,8 +88,6 @@ ABSL_LIBS = absl/base/internal/cycleclock.o \
     absl/types/bad_variant_access.o
 
 S2LIBS = $(ABSL_LIBS) \
-     s2-geography/capi/tessellator.o \
-     s2-geography/capi/status.o \
      s2-geography/linear-referencing.o \
      s2-geography/distance.o \
      s2-geography/accessors.o \

diff --git a/src/s2-geography/capi/status.cpp b/src/s2-geography/capi/status.cpp
diff --git a/src/s2-geography/capi/tessellator.cpp → src/tessellator.cpp b/src/s2-geography/capi/tessellator.cpp → src/tessellator.cpp
diff --git a/src/s2-geography/s2-geography_c.h → src/tessellator.h b/src/s2-geography/s2-geography_c.h → src/tessellator.h
diff --git a/src/wk-c-utils.c b/src/wk-c-utils.c
@@ -3,7 +3,7 @@
 #include <R.h>
 #include <Rinternals.h>
 #include "wk-v1.h"
-#include "s2-geography/s2-geography_c.h"
+#include "tessellator.h"
 
 // Expose projections as external pointers so that they can theoretically be generated
 // by other packages.