Skip to content

Commit 4ab2fc0

Browse files
Andreas-WAndreas-W
committed
# Conflicts: # Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.cpp # GeneralsMD/Code/GameEngine/CMakeLists.txt # GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h # GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h # GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp # GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp # GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/MissileAIUpdate.cpp # GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp # GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp # GeneralsMD/Code/GameEngine/Source/GameLogic/Object/WeaponSet.cpp # GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp # GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp # GeneralsMD/Code/Main/WinMain.cpp
2 parents 0b79d19 + 4e4b731 commit 4ab2fc0

File tree

1,626 files changed

+27489
-38312
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,626 files changed

+27489
-38312
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 Cloudflare R2
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",
@@ -107,14 +99,6 @@
10799
"RTS_BUILD_OPTION_PROFILE": "ON"
108100
}
109101
},
110-
{
111-
"name": "win32-internal",
112-
"inherits": "win32",
113-
"displayName": "Windows 32bit Internal",
114-
"cacheVariables": {
115-
"RTS_BUILD_OPTION_INTERNAL": "ON"
116-
}
117-
},
118102
{
119103
"name": "win32-debug",
120104
"inherits": "win32",
@@ -149,14 +133,6 @@
149133
"RTS_BUILD_OPTION_PROFILE": "ON"
150134
}
151135
},
152-
{
153-
"name": "win32-vcpkg-internal",
154-
"inherits": "win32-vcpkg",
155-
"displayName": "Windows 32bit VCPKG Internal",
156-
"cacheVariables": {
157-
"RTS_BUILD_OPTION_INTERNAL": "ON"
158-
}
159-
},
160136
{
161137
"name": "win32-vcpkg-debug",
162138
"inherits": "win32-vcpkg",
@@ -179,12 +155,6 @@
179155
"displayName": "Build Windows 32bit VC6 Release",
180156
"description": "Build Windows 32bit VC6 Release"
181157
},
182-
{
183-
"name": "vc6-internal",
184-
"configurePreset": "vc6-internal",
185-
"displayName": "Build Windows 32bit VC6 Internal",
186-
"description": "Build Windows 32bit VC6 Internal"
187-
},
188158
{
189159
"name": "vc6-profile",
190160
"configurePreset": "vc6-profile",
@@ -204,13 +174,6 @@
204174
"description": "Build Windows 32bit Release",
205175
"configuration": "Release"
206176
},
207-
{
208-
"name": "win32-internal",
209-
"configurePreset": "win32-internal",
210-
"displayName": "Build Windows 32bit Internal",
211-
"description": "Build Windows 32bit Internal",
212-
"configuration": "Release"
213-
},
214177
{
215178
"name": "win32-profile",
216179
"configurePreset": "win32-profile",
@@ -232,13 +195,6 @@
232195
"description": "Build Windows 32bit VCPKG Release",
233196
"configuration": "Release"
234197
},
235-
{
236-
"name": "win32-vcpkg-internal",
237-
"configurePreset": "win32-vcpkg-internal",
238-
"displayName": "Build Windows 32bit VCPKG Internal",
239-
"description": "Build Windows 32bit VCPKG Internal",
240-
"configuration": "Release"
241-
},
242198
{
243199
"name": "win32-vcpkg-profile",
244200
"configurePreset": "win32-vcpkg-profile",
@@ -288,19 +244,6 @@
288244
}
289245
]
290246
},
291-
{
292-
"name": "vc6-internal",
293-
"steps": [
294-
{
295-
"type": "configure",
296-
"name": "vc6-internal"
297-
},
298-
{
299-
"type": "build",
300-
"name": "vc6-internal"
301-
}
302-
]
303-
},
304247
{
305248
"name": "vc6-profile",
306249
"steps": [
@@ -327,19 +270,6 @@
327270
}
328271
]
329272
},
330-
{
331-
"name": "win32-internal",
332-
"steps": [
333-
{
334-
"type": "configure",
335-
"name": "win32-internal"
336-
},
337-
{
338-
"type": "build",
339-
"name": "win32-internal"
340-
}
341-
]
342-
},
343273
{
344274
"name": "win32-profile",
345275
"steps": [
@@ -379,19 +309,6 @@
379309
}
380310
]
381311
},
382-
{
383-
"name": "win32-vcpkg-internal",
384-
"steps": [
385-
{
386-
"type": "configure",
387-
"name": "win32-vcpkg-internal"
388-
},
389-
{
390-
"type": "build",
391-
"name": "win32-vcpkg-internal"
392-
}
393-
]
394-
},
395312
{
396313
"name": "win32-vcpkg-profile",
397314
"steps": [

0 commit comments

Comments
 (0)