Skip to content

Commit dd2890c

Browse files
authored
[CORE] Unify remaining WWMath (#745)
1 parent 7ce6184 commit dd2890c

File tree

16 files changed

+6
-5101
lines changed

16 files changed

+6
-5101
lines changed

Core/Libraries/Source/WWVegas/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ target_link_libraries(core_wwvegas INTERFACE
5252
core_wwdebug
5353
# core_wwdownload
5454
core_wwlib
55-
# core_wwmath
55+
core_wwmath
5656
core_wwsaveload
5757
# core_wwshade
5858
# core_wwutil

Core/Libraries/Source/WWVegas/WWMath/CMakeLists.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@ set(WWMATH_SRC
44
aabtreecull.cpp
55
aabtreecull.h
66
aaplane.h
7-
#cardinalspline.cpp # to be moved
7+
cardinalspline.cpp
88
cardinalspline.h
99
castres.h
1010
catmullromspline.cpp
1111
catmullromspline.h
1212
colmath.cpp
1313
colmath.h
14-
#colmathaabox.cpp # to be moved
14+
colmathaabox.cpp
1515
colmathaabox.h
16-
#colmathaabtri.cpp # to be moved
16+
colmathaabtri.cpp
1717
colmathfrustum.cpp
1818
colmathfrustum.h
1919
colmathinlines.h
2020
colmathline.cpp
2121
colmathline.h
22-
#colmathobbobb.cpp # to be moved
22+
colmathobbobb.cpp
2323
colmathobbox.cpp
24-
#colmathobbtri.cpp # to be moved
24+
colmathobbtri.cpp
2525
colmathplane.cpp
2626
colmathplane.h
2727
colmathsphere.cpp

Generals/Code/Libraries/Source/WWVegas/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ target_include_directories(g_wwcommon INTERFACE
1818
)
1919

2020
add_subdirectory(WWAudio)
21-
add_subdirectory(WWMath)
2221
add_subdirectory(Wwutil)
2322
add_subdirectory(WW3D2)
2423
add_subdirectory(WWDownload)
@@ -38,6 +37,5 @@ target_link_libraries(g_wwvegas INTERFACE
3837
core_wwvegas
3938
g_ww3d2
4039
g_wwdownload
41-
g_wwmath
4240
g_wwutil
4341
)

Generals/Code/Libraries/Source/WWVegas/WWMath/CMakeLists.txt

-18
This file was deleted.

0 commit comments

Comments
 (0)