Skip to content

Commit

Permalink
Revert "Merge pull request godotengine#94321 from fire/vsk-csg-manifo…
Browse files Browse the repository at this point in the history
…ld-update-4.3"

This reverts commit c814493, reversing
changes made to 274fc98.
  • Loading branch information
zhangjiangen11 committed Nov 30, 2024
1 parent 088eb02 commit b9f16d3
Show file tree
Hide file tree
Showing 45 changed files with 1,624 additions and 20,001 deletions.
5 changes: 0 additions & 5 deletions COPYRIGHT.txt
Original file line number Diff line number Diff line change
Expand Up @@ -334,11 +334,6 @@ Comment: WebP codec
Copyright: 2010, Google Inc.
License: BSD-3-clause

Files: ./thirdparty/manifold/
Comment: Manifold
Copyright: 2020-2024, The Manifold Authors
License: Apache-2.0

Files: ./thirdparty/mbedtls/
Comment: Mbed TLS
Copyright: The Mbed TLS Contributors
Expand Down
37 changes: 1 addition & 36 deletions modules/csg/SCsub
Original file line number Diff line number Diff line change
Expand Up @@ -6,42 +6,7 @@ Import("env_modules")

env_csg = env_modules.Clone()

env_csg.Append(CPPDEFINES=("MANIFOLD_PAR", "-1"))

# Thirdparty source files

thirdparty_obj = []

thirdparty_dir = "#thirdparty/manifold/"
thirdparty_sources = [
"src/boolean_result.cpp",
"src/boolean3.cpp",
"src/constructors.cpp",
"src/csg_tree.cpp",
"src/edge_op.cpp",
"src/face_op.cpp",
"src/impl.cpp",
"src/manifold.cpp",
"src/polygon.cpp",
"src/properties.cpp",
"src/quickhull.cpp",
"src/smoothing.cpp",
"src/sort.cpp",
"src/subdivision.cpp",
]

thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
env_csg.Prepend(
CPPPATH=[
thirdparty_dir + "include",
]
)
env_thirdparty = env_csg.Clone()
env_thirdparty.disable_warnings()
env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources)
env.modules_sources += thirdparty_obj

# Godot's own source files
# Godot source files
env_csg.add_source_files(env.modules_sources, "*.cpp")
if env.editor_build:
env_csg.add_source_files(env.modules_sources, "editor/*.cpp")
Loading

0 comments on commit b9f16d3

Please sign in to comment.