Skip to content

[CORE] Unify remaining WWMath #745

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.

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

Merged
merged 1 commit into from
Apr 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ target_link_libraries(core_wwvegas INTERFACE
core_wwdebug
# core_wwdownload
core_wwlib
# core_wwmath
core_wwmath
core_wwsaveload
# core_wwshade
# core_wwutil
Expand Down
10 changes: 5 additions & 5 deletions Core/Libraries/Source/WWVegas/WWMath/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@ set(WWMATH_SRC
aabtreecull.cpp
aabtreecull.h
aaplane.h
#cardinalspline.cpp # to be moved
cardinalspline.cpp
cardinalspline.h
castres.h
catmullromspline.cpp
catmullromspline.h
colmath.cpp
colmath.h
#colmathaabox.cpp # to be moved
colmathaabox.cpp
colmathaabox.h
#colmathaabtri.cpp # to be moved
colmathaabtri.cpp
colmathfrustum.cpp
colmathfrustum.h
colmathinlines.h
colmathline.cpp
colmathline.h
#colmathobbobb.cpp # to be moved
colmathobbobb.cpp
colmathobbox.cpp
#colmathobbtri.cpp # to be moved
colmathobbtri.cpp
colmathplane.cpp
colmathplane.h
colmathsphere.cpp
Expand Down
2 changes: 0 additions & 2 deletions Generals/Code/Libraries/Source/WWVegas/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ target_include_directories(g_wwcommon INTERFACE
)

add_subdirectory(WWAudio)
add_subdirectory(WWMath)
add_subdirectory(Wwutil)
add_subdirectory(WW3D2)
add_subdirectory(WWDownload)
Expand All @@ -38,6 +37,5 @@ target_link_libraries(g_wwvegas INTERFACE
core_wwvegas
g_ww3d2
g_wwdownload
g_wwmath
g_wwutil
)
18 changes: 0 additions & 18 deletions Generals/Code/Libraries/Source/WWVegas/WWMath/CMakeLists.txt

This file was deleted.

Loading
Loading