Skip to content

Commit 4b6a0a1

Browse files
committed
[CMAKE] Remove RTS_BUILD_OPTION_INTERNAL (#1231)
1 parent 7909aee commit 4b6a0a1

File tree

2 files changed

+3
-91
lines changed

2 files changed

+3
-91
lines changed

CMakePresets.json

Lines changed: 0 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,6 @@
3434
"RTS_BUILD_OPTION_PROFILE": "ON"
3535
}
3636
},
37-
{
38-
"name": "vc6-internal",
39-
"displayName": "Windows 32bit VC6 Internal",
40-
"inherits": "vc6",
41-
"cacheVariables": {
42-
"RTS_BUILD_OPTION_INTERNAL": "ON"
43-
}
44-
},
4537
{
4638
"name": "vc6-debug",
4739
"displayName": "Windows 32bit VC6 Debug",
@@ -103,14 +95,6 @@
10395
"RTS_BUILD_OPTION_PROFILE": "ON"
10496
}
10597
},
106-
{
107-
"name": "win32-internal",
108-
"inherits": "win32",
109-
"displayName": "Windows 32bit Internal",
110-
"cacheVariables": {
111-
"RTS_BUILD_OPTION_INTERNAL": "ON"
112-
}
113-
},
11498
{
11599
"name": "win32-debug",
116100
"inherits": "win32",
@@ -145,14 +129,6 @@
145129
"RTS_BUILD_OPTION_PROFILE": "ON"
146130
}
147131
},
148-
{
149-
"name": "win32-vcpkg-internal",
150-
"inherits": "win32-vcpkg",
151-
"displayName": "Windows 32bit VCPKG Internal",
152-
"cacheVariables": {
153-
"RTS_BUILD_OPTION_INTERNAL": "ON"
154-
}
155-
},
156132
{
157133
"name": "win32-vcpkg-debug",
158134
"inherits": "win32-vcpkg",
@@ -175,12 +151,6 @@
175151
"displayName": "Build Windows 32bit VC6 Release",
176152
"description": "Build Windows 32bit VC6 Release"
177153
},
178-
{
179-
"name": "vc6-internal",
180-
"configurePreset": "vc6-internal",
181-
"displayName": "Build Windows 32bit VC6 Internal",
182-
"description": "Build Windows 32bit VC6 Internal"
183-
},
184154
{
185155
"name": "vc6-profile",
186156
"configurePreset": "vc6-profile",
@@ -200,13 +170,6 @@
200170
"description": "Build Windows 32bit Release",
201171
"configuration": "Release"
202172
},
203-
{
204-
"name": "win32-internal",
205-
"configurePreset": "win32-internal",
206-
"displayName": "Build Windows 32bit Internal",
207-
"description": "Build Windows 32bit Internal",
208-
"configuration": "Release"
209-
},
210173
{
211174
"name": "win32-profile",
212175
"configurePreset": "win32-profile",
@@ -228,13 +191,6 @@
228191
"description": "Build Windows 32bit VCPKG Release",
229192
"configuration": "Release"
230193
},
231-
{
232-
"name": "win32-vcpkg-internal",
233-
"configurePreset": "win32-vcpkg-internal",
234-
"displayName": "Build Windows 32bit VCPKG Internal",
235-
"description": "Build Windows 32bit VCPKG Internal",
236-
"configuration": "Release"
237-
},
238194
{
239195
"name": "win32-vcpkg-profile",
240196
"configurePreset": "win32-vcpkg-profile",
@@ -284,19 +240,6 @@
284240
}
285241
]
286242
},
287-
{
288-
"name": "vc6-internal",
289-
"steps": [
290-
{
291-
"type": "configure",
292-
"name": "vc6-internal"
293-
},
294-
{
295-
"type": "build",
296-
"name": "vc6-internal"
297-
}
298-
]
299-
},
300243
{
301244
"name": "vc6-profile",
302245
"steps": [
@@ -323,19 +266,6 @@
323266
}
324267
]
325268
},
326-
{
327-
"name": "win32-internal",
328-
"steps": [
329-
{
330-
"type": "configure",
331-
"name": "win32-internal"
332-
},
333-
{
334-
"type": "build",
335-
"name": "win32-internal"
336-
}
337-
]
338-
},
339269
{
340270
"name": "win32-profile",
341271
"steps": [
@@ -375,19 +305,6 @@
375305
}
376306
]
377307
},
378-
{
379-
"name": "win32-vcpkg-internal",
380-
"steps": [
381-
{
382-
"type": "configure",
383-
"name": "win32-vcpkg-internal"
384-
},
385-
{
386-
"type": "build",
387-
"name": "win32-vcpkg-internal"
388-
}
389-
]
390-
},
391308
{
392309
"name": "win32-vcpkg-profile",
393310
"steps": [

cmake/config-build.cmake

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ option(RTS_BUILD_CORE_TOOLS "Build core tools" ON)
33
option(RTS_BUILD_CORE_EXTRAS "Build core extra tools/tests" OFF)
44
option(RTS_BUILD_ZEROHOUR "Build Zero Hour code." ON)
55
option(RTS_BUILD_GENERALS "Build Generals code." ON)
6-
option(RTS_BUILD_OPTION_INTERNAL "Build code with the \"Internal\" configuration." OFF)
76
option(RTS_BUILD_OPTION_PROFILE "Build code with the \"Profile\" configuration." OFF)
87
option(RTS_BUILD_OPTION_DEBUG "Build code with the \"Debug\" configuration." OFF)
98
option(RTS_BUILD_OPTION_ASAN "Build code with Address Sanitizer." OFF)
@@ -18,7 +17,6 @@ add_feature_info(CoreTools RTS_BUILD_CORE_TOOLS "Build Core Mod Tools")
1817
add_feature_info(CoreExtras RTS_BUILD_CORE_EXTRAS "Build Core Extra Tools/Tests")
1918
add_feature_info(ZeroHourStuff RTS_BUILD_ZEROHOUR "Build Zero Hour code")
2019
add_feature_info(GeneralsStuff RTS_BUILD_GENERALS "Build Generals code")
21-
add_feature_info(InternalBuild RTS_BUILD_OPTION_INTERNAL "Building as an \"Internal\" build")
2220
add_feature_info(ProfileBuild RTS_BUILD_OPTION_PROFILE "Building as a \"Profile\" build")
2321
add_feature_info(DebugBuild RTS_BUILD_OPTION_DEBUG "Building as a \"Debug\" build")
2422
add_feature_info(AddressSanitizer RTS_BUILD_OPTION_ASAN "Building with address sanitizer")
@@ -64,11 +62,8 @@ if(RTS_BUILD_OPTION_DEBUG)
6462
target_compile_definitions(core_config INTERFACE RTS_DEBUG WWDEBUG DEBUG)
6563
else()
6664
target_compile_definitions(core_config INTERFACE RTS_RELEASE)
65+
endif()
6766

68-
if(RTS_BUILD_OPTION_INTERNAL)
69-
target_compile_definitions(core_config INTERFACE RTS_INTERNAL)
70-
endif()
71-
if(RTS_BUILD_OPTION_PROFILE)
72-
target_compile_definitions(core_config INTERFACE RTS_PROFILE)
73-
endif()
67+
if(RTS_BUILD_OPTION_PROFILE)
68+
target_compile_definitions(core_config INTERFACE RTS_PROFILE)
7469
endif()

0 commit comments

Comments
 (0)