Skip to content

Commit 077b657

Browse files
committed
unify(lib): Move BaseType.h, trig.h to Core (TheSuperHackers#2185)
1 parent f15abf3 commit 077b657

8 files changed

Lines changed: 5 additions & 499 deletions

File tree

Core/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ target_include_directories(corei_libraries_source_wwvegas_wwlib INTERFACE "Libra
1414
target_include_directories(corei_main INTERFACE "Main")
1515

1616
target_sources(corei_libraries_include PRIVATE
17+
Libraries/Include/Lib/BaseType.h
1718
Libraries/Include/Lib/BaseTypeCore.h
19+
Libraries/Include/Lib/trig.h
1820
Libraries/Include/rts/debug.h
1921
Libraries/Include/rts/profile.h
2022
)
File renamed without changes.
File renamed without changes.

Generals/Code/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
# g stands for Generals, i stands for Interface
22
add_library(gi_gameengine_include INTERFACE)
3-
add_library(gi_libraries_include INTERFACE)
43
add_library(gi_libraries_source_wwvegas INTERFACE)
54
add_library(gi_main INTERFACE)
65
add_library(gi_always INTERFACE)
76
add_library(gi_always_no_pch INTERFACE) # Use this for Shared Libs with MFC AFX
87

98
target_include_directories(gi_gameengine_include INTERFACE "GameEngine/Include")
10-
target_include_directories(gi_libraries_include INTERFACE "Libraries/Include")
119
target_include_directories(gi_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas")
1210
target_include_directories(gi_main INTERFACE "Main")
1311

14-
target_sources(gi_libraries_include PRIVATE
15-
Libraries/Include/Lib/BaseType.h
16-
Libraries/Include/Lib/trig.h
17-
)
1812
target_compile_definitions(gi_always INTERFACE
1913
RTS_GENERALS=1
2014
)
@@ -25,11 +19,9 @@ target_link_libraries(gi_gameengine_include INTERFACE
2519
corei_gameengine_include
2620
)
2721
target_link_libraries(gi_always INTERFACE
28-
gi_libraries_include
2922
corei_always # Must stay below so headers from game are included first
3023
)
3124
target_link_libraries(gi_always_no_pch INTERFACE
32-
gi_libraries_include
3325
corei_always_no_pch # Must stay below so headers from game are included first
3426
)
3527

0 commit comments

Comments
 (0)