Skip to content

Commit fbc5248

Browse files
fbraz3fbraz3
committed
2 parents cda6a6b + 5989558 commit fbc5248

File tree

1,170 files changed

+10454
-10471
lines changed

Some content is hidden

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

1,170 files changed

+10454
-10471
lines changed

‎.github/workflows/build-toolchain.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ jobs:
4848
uses: actions/cache@v4
4949
with:
5050
path: build\${{ inputs.preset }}\_deps
51-
key: cmake-deps-${{ inputs.preset }}-${{ hashFiles('cmake/**/*.cmake', '**/CMakeLists.txt') }}
52-
restore-keys: |
53-
cmake-deps-${{ inputs.preset }}-
51+
key: cmake-deps-${{ inputs.preset }}-${{ hashFiles('CMakePresets.json','cmake/**/*.cmake','**/CMakeLists.txt') }}
5452

5553
- name: Download VC6 Portable from itsmattkc repo
5654
if: ${{ startsWith(inputs.preset, 'vc6') && steps.cache-vc6.outputs.cache-hit != 'true' }}

‎.github/workflows/ci.yml

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -69,24 +69,28 @@ jobs:
6969
- preset: "vc6-profile"
7070
tools: true
7171
extras: true
72-
- preset: "vc6-internal"
73-
tools: true
74-
extras: true
7572
- preset: "vc6-debug"
7673
tools: true
7774
extras: true
78-
- preset: "win32-vcpkg"
79-
tools: true
80-
extras: true
81-
- preset: "win32-vcpkg-profile"
75+
- preset: "win32"
8276
tools: true
8377
extras: true
84-
- preset: "win32-vcpkg-internal"
78+
- preset: "win32-profile"
8579
tools: true
8680
extras: true
87-
- preset: "win32-vcpkg-debug"
81+
- preset: "win32-debug"
8882
tools: true
8983
extras: true
84+
# vcpkg builds have been disabled for now due to excessive build times of 30 minutes per preset
85+
# - preset: "win32-vcpkg"
86+
# tools: true
87+
# extras: true
88+
# - preset: "win32-vcpkg-profile"
89+
# tools: true
90+
# extras: true
91+
# - preset: "win32-vcpkg-debug"
92+
# tools: true
93+
# extras: true
9094
fail-fast: false
9195
uses: ./.github/workflows/build-toolchain.yml
9296
with:
@@ -109,9 +113,6 @@ jobs:
109113
- preset: "vc6-profile"
110114
tools: true
111115
extras: true
112-
- preset: "vc6-internal"
113-
tools: true
114-
extras: true
115116
- preset: "vc6-debug"
116117
tools: true
117118
extras: true
@@ -121,12 +122,19 @@ jobs:
121122
- preset: "win32-profile"
122123
tools: true
123124
extras: true
124-
- preset: "win32-internal"
125-
tools: true
126-
extras: true
127125
- preset: "win32-debug"
128126
tools: true
129127
extras: true
128+
# vcpkg builds have been disabled for now due to excessive build times of 30 minutes per preset
129+
# - preset: "win32-vcpkg"
130+
# tools: true
131+
# extras: true
132+
# - preset: "win32-vcpkg-profile"
133+
# tools: true
134+
# extras: true
135+
# - preset: "win32-vcpkg-debug"
136+
# tools: true
137+
# extras: true
130138
fail-fast: false
131139
uses: ./.github/workflows/build-toolchain.yml
132140
with:

‎CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,11 @@ include(cmake/config.cmake)
5757
include(cmake/gamespy.cmake)
5858
include(cmake/lzhl.cmake)
5959

60-
add_subdirectory(Dependencies/Benchmark)
6160
if (IS_VS6_BUILD)
6261
# The original max sdk does not compile against a modern compiler.
6362
# If there is a desire to make this work, then a fixed max sdk needs to be created.
6463
add_subdirectory(Dependencies/MaxSDK)
6564
endif()
66-
add_subdirectory(Dependencies/SafeDisc)
6765
add_subdirectory(Dependencies/Utility)
6866
add_subdirectory(resources)
6967

‎CMakePresets.json

Lines changed: 2 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
{
1010
"name": "vc6",
1111
"displayName": "Windows 32bit VC6 Release",
12-
"generator": "NMake Makefiles",
12+
"generator": "Ninja",
1313
"hidden": false,
1414
"binaryDir": "${sourceDir}/build/${presetName}",
1515
"cacheVariables": {
1616
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
1717
"CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL",
18-
"CMAKE_MSVC_DEBUG_INFORMATION_FORMAT": "$<$<CONFIG:Release,Debug,RelWithDebInfo>:ProgramDatabase>",
18+
"CMAKE_MSVC_DEBUG_INFORMATION_FORMAT": "",
1919
"CMAKE_BUILD_TYPE": "Release",
2020
"RTS_FLAGS": "/W3"
2121
},
@@ -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": [

0 commit comments

Comments
 (0)