Skip to content

Commit 9862994

Browse files
authored
[GEN][ZH] Remove obsolete benchmark dependency (#1038)
1 parent 8b12e27 commit 9862994

File tree

10 files changed

+10
-33
lines changed

10 files changed

+10
-33
lines changed

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ 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.

Core/Tools/ImagePacker/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ target_include_directories(corei_imagepacker INTERFACE
2626
)
2727

2828
target_link_libraries(corei_imagepacker INTERFACE
29-
benchmark
3029
comctl32
3130
core_debug
3231
core_profile

Dependencies/Benchmark/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.

Dependencies/Benchmark/benchmark.h

Lines changed: 0 additions & 19 deletions
This file was deleted.

Generals/Code/GameEngineDevice/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ target_link_libraries(g_gameenginedevice PRIVATE
195195
)
196196

197197
target_link_libraries(g_gameenginedevice PUBLIC
198-
benchmark
199198
binkstub
200199
d3d8lib
201200
g_gameengine

Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
#include "d3dx8tex.h"
7373
#include "dx8caps.h"
7474
#include "Common/GameLOD.h"
75-
#include "benchmark.h"
7675

7776
#ifdef RTS_INTERNAL
7877
// for occasional debugging...
@@ -2844,7 +2843,11 @@ Bool W3DShaderManager::testMinimumRequirements(ChipsetType *videoChipType, CpuTy
28442843

28452844
if (intBenchIndex && floatBenchIndex && memBenchIndex)
28462845
{
2847-
RunBenchmark(0, NULL, floatBenchIndex, intBenchIndex, memBenchIndex);
2846+
// TheSuperHackers @tweak Aliendroid1 19/06/2025 Legacy benchmarking code was removed.
2847+
// Since modern hardware always meets the minimum requirements, we preset the benchmark "results" to a high value.
2848+
*intBenchIndex = 10.0f;
2849+
*floatBenchIndex = 10.0f;
2850+
*memBenchIndex = 10.0f;
28482851
}
28492852

28502853
return TRUE;

Generals/Code/Tools/GUIEdit/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ target_include_directories(g_guiedit PRIVATE
4646
)
4747

4848
target_link_libraries(g_guiedit PRIVATE
49-
benchmark
5049
comctl32
5150
d3d8lib
5251
dbghelplib

GeneralsMD/Code/GameEngineDevice/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@ target_link_libraries(z_gameenginedevice PRIVATE
222222
)
223223

224224
target_link_libraries(z_gameenginedevice PUBLIC
225-
benchmark
226225
binkstub
227226
d3d8lib
228227
milesstub

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
#include "d3dx8tex.h"
7474
#include "dx8caps.h"
7575
#include "Common/GameLOD.h"
76-
#include "benchmark.h"
7776

7877
#ifdef RTS_INTERNAL
7978
// for occasional debugging...
@@ -3114,7 +3113,11 @@ Bool W3DShaderManager::testMinimumRequirements(ChipsetType *videoChipType, CpuTy
31143113

31153114
if (intBenchIndex && floatBenchIndex && memBenchIndex)
31163115
{
3117-
RunBenchmark(0, NULL, floatBenchIndex, intBenchIndex, memBenchIndex);
3116+
// TheSuperHackers @tweak Aliendroid1 19/06/2025 Legacy benchmarking code was removed.
3117+
// Since modern hardware always meets the minimum requirements, we preset the benchmark "results" to a high value.
3118+
*intBenchIndex = 10.0f;
3119+
*floatBenchIndex = 10.0f;
3120+
*memBenchIndex = 10.0f;
31183121
}
31193122

31203123
return TRUE;

GeneralsMD/Code/Tools/GUIEdit/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ target_include_directories(z_guiedit PRIVATE
4646
)
4747

4848
target_link_libraries(z_guiedit PRIVATE
49-
benchmark
5049
comctl32
5150
core_debug
5251
core_profile

0 commit comments

Comments
 (0)