Skip to content

Commit 86e72b4

Browse files
authored
[CORE] Move assetcull, mangler, wolSetup tools to Core (#721)
1 parent 33f1516 commit 86e72b4

File tree

154 files changed

+42
-18491
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+42
-18491
lines changed

Core/Tools/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@ endif()
77

88
# Build less useful tool/test binaries.
99
if(RTS_BUILD_CORE_EXTRAS)
10+
add_subdirectory(assetcull)
1011
add_subdirectory(Babylon)
1112
add_subdirectory(buildVersionUpdate)
1213
add_subdirectory(Compress)
1314
add_subdirectory(CRCDiff)
15+
add_subdirectory(mangler)
1416
add_subdirectory(matchbot)
1517
add_subdirectory(textureCompress)
1618
add_subdirectory(timingTest)
1719
add_subdirectory(versionUpdate)
20+
add_subdirectory(wolSetup)
1821
add_subdirectory(WW3D)
1922
endif()

Core/Tools/assetcull/CMakeLists.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
set(ASSETCULL_SRC
2+
"assetcull.cpp"
3+
)
4+
5+
add_executable(core_assetcull WIN32)
6+
set_target_properties(core_assetcull PROPERTIES OUTPUT_NAME assetcull)
7+
8+
target_sources(core_assetcull PRIVATE ${ASSETCULL_SRC})
9+
10+
target_link_libraries(core_assetcull PRIVATE
11+
core_config
12+
)
13+
14+
if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
15+
target_link_options(core_assetcull PRIVATE /subsystem:console)
16+
endif()

Generals/Code/Tools/mangler/CMakeLists.txt renamed to Core/Tools/mangler/CMakeLists.txt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -56,40 +56,40 @@ set(MANGLERTEST_SRC
5656
"manglertest.cpp"
5757
)
5858

59-
add_library(g_manglerlib STATIC)
60-
set_target_properties(g_manglerlib PROPERTIES OUTPUT_NAME manglerlib)
59+
add_library(core_manglerlib STATIC)
60+
set_target_properties(core_manglerlib PROPERTIES OUTPUT_NAME manglerlib)
6161

62-
target_sources(g_manglerlib PUBLIC ${MANGLERLIB_SRC})
63-
target_include_directories(g_manglerlib PRIVATE . wlib wnet)
64-
target_link_libraries(g_manglerlib PRIVATE wsock32)
65-
target_link_libraries(g_manglerlib PUBLIC
62+
target_sources(core_manglerlib PUBLIC ${MANGLERLIB_SRC})
63+
target_include_directories(core_manglerlib PRIVATE . wlib wnet)
64+
target_link_libraries(core_manglerlib PRIVATE wsock32)
65+
target_link_libraries(core_manglerlib PUBLIC
6666
core_config
6767
core_utility
6868
)
6969

7070
# mangler app
7171

72-
add_executable(g_mangler WIN32)
73-
set_target_properties(g_mangler PROPERTIES OUTPUT_NAME mangler)
72+
add_executable(core_mangler WIN32)
73+
set_target_properties(core_mangler PROPERTIES OUTPUT_NAME mangler)
7474

75-
target_sources(g_mangler PRIVATE ${MANGLER_SRC})
76-
target_include_directories(g_mangler PRIVATE . wlib wnet)
77-
target_link_libraries(g_mangler PRIVATE g_manglerlib)
75+
target_sources(core_mangler PRIVATE ${MANGLER_SRC})
76+
target_include_directories(core_mangler PRIVATE . wlib wnet)
77+
target_link_libraries(core_mangler PRIVATE core_manglerlib)
7878

7979
if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
80-
target_link_options(g_mangler PRIVATE /subsystem:console)
80+
target_link_options(core_mangler PRIVATE /subsystem:console)
8181
endif()
8282

8383

8484
# manglertest app
8585

86-
add_executable(g_manglertest WIN32)
87-
set_target_properties(g_manglertest PROPERTIES OUTPUT_NAME manglertest)
86+
add_executable(core_manglertest WIN32)
87+
set_target_properties(core_manglertest PROPERTIES OUTPUT_NAME manglertest)
8888

89-
target_sources(g_manglertest PRIVATE ${MANGLERTEST_SRC})
90-
target_include_directories(g_manglertest PRIVATE . wlib wnet)
91-
target_link_libraries(g_manglertest PRIVATE g_manglerlib)
89+
target_sources(core_manglertest PRIVATE ${MANGLERTEST_SRC})
90+
target_include_directories(core_manglertest PRIVATE . wlib wnet)
91+
target_link_libraries(core_manglertest PRIVATE core_manglerlib)
9292

9393
if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
94-
target_link_options(g_manglertest PRIVATE /subsystem:console)
94+
target_link_options(core_manglertest PRIVATE /subsystem:console)
9595
endif()
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)