Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Trim down unnecessary S2 sources #6456

Merged
merged 6 commits into from
Apr 3, 2023
Merged

Trim down unnecessary S2 sources #6456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8e53684
integrate Realm logging and assertions
ironage Mar 29, 2023
94760f8
remove some string utilities
ironage Mar 29, 2023
c9b4256
remove encoder/decoder
ironage Mar 30, 2023
21a4b74
remove some base files
ironage Mar 30, 2023
8fcb47b
remove hash
ironage Mar 30, 2023
c1fecf5
fix header search path for s2 swift builds
ironage Mar 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,7 @@ let package = Package(
publicHeadersPath: ".",
cxxSettings: ([
.headerSearchPath(".."),
.headerSearchPath("../.."),
] + cxxSettings) as [CXXSetting]),
.target(
name: "RealmCore",
Expand Down
20 changes: 0 additions & 20 deletions src/external/s2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,33 +26,13 @@ set(S2_SOURCES
s2regionunion.cc
)

set(S2_BASE_SOURCES
base/int128.cc
base/logging.cc
base/stringprintf.cc
base/strtoint.cc
)

set(S2_STRINGS_SOURCES
strings/split.cc
strings/strutil.cc
)

set(S2_UTIL_CODING_SOURCES
util/coding/coder.cc
util/coding/varint.cc
)

set(S2_UTIL_MATH_SOURCES
util/math/mathutil.cc
util/math/mathlimits.cc
)

add_library(s2geometry OBJECT
${S2_SOURCES}
${S2_BASE_SOURCES}
${S2_STRINGS_SOURCES}
${S2_UTIL_CODING_SOURCES}
${S2_UTIL_MATH_SOURCES}
)

Expand Down
1 change: 0 additions & 1 deletion src/external/s2/base/basictypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

#include "s2/base/integral_types.h"
#include "s2/base/casts.h"
#include "s2/base/port.h"

//
// Google-specific types
Expand Down
340 changes: 0 additions & 340 deletions src/external/s2/base/docid.h
View file
Open in desktop

This file was deleted.

Loading