File tree Expand file tree Collapse file tree 2 files changed +14
-3
lines changed Expand file tree Collapse file tree 2 files changed +14
-3
lines changed Original file line number Diff line number Diff line change @@ -40,8 +40,13 @@ if (NOT IS_VS6_BUILD)
40
40
add_compile_options (/Zc:__cplusplus )
41
41
endif ()
42
42
else ()
43
- # Define two pools: 'compile' with plenty of slots, 'link' with just one
44
- set_property (GLOBAL PROPERTY JOB_POOLS compile=0 link=1 )
43
+ if (RTS_BUILD_OPTION_VC6_FULL_DEBUG )
44
+ set_property (GLOBAL PROPERTY JOB_POOLS compile=1 link=1 )
45
+ else ()
46
+ # Define two pools: 'compile' with plenty of slots, 'link' with just one
47
+ set_property (GLOBAL PROPERTY JOB_POOLS compile=0 link=1 )
48
+ endif ()
49
+
45
50
# Tell CMake that all compile steps go into 'compile'
46
51
set (CMAKE_JOB_POOL_COMPILE compile )
47
52
# and all link steps go into 'link' (so only one link ever runs since vc6 can't handle multithreaded linking)
Original file line number Diff line number Diff line change @@ -6,6 +6,7 @@ option(RTS_BUILD_GENERALS "Build Generals code." ON)
6
6
option (RTS_BUILD_OPTION_PROFILE "Build code with the \" Profile\" configuration." OFF )
7
7
option (RTS_BUILD_OPTION_DEBUG "Build code with the \" Debug\" configuration." OFF )
8
8
option (RTS_BUILD_OPTION_ASAN "Build code with Address Sanitizer." OFF )
9
+ option (RTS_BUILD_OPTION_VC6_FULL_DEBUG "Build VC6 with full debug info." OFF )
9
10
option (RTS_BUILD_OPTION_FFMPEG "Enable FFmpeg support" OFF )
10
11
11
12
if (NOT RTS_BUILD_ZEROHOUR AND NOT RTS_BUILD_GENERALS )
@@ -20,6 +21,7 @@ add_feature_info(GeneralsStuff RTS_BUILD_GENERALS "Build Generals code")
20
21
add_feature_info (ProfileBuild RTS_BUILD_OPTION_PROFILE "Building as a \" Profile\" build" )
21
22
add_feature_info (DebugBuild RTS_BUILD_OPTION_DEBUG "Building as a \" Debug\" build" )
22
23
add_feature_info (AddressSanitizer RTS_BUILD_OPTION_ASAN "Building with address sanitizer" )
24
+ add_feature_info (Vc6FullDebug RTS_BUILD_OPTION_VC6_FULL_DEBUG "Building VC6 with full debug info" )
23
25
add_feature_info (FFmpegSupport RTS_BUILD_OPTION_FFMPEG "Building with FFmpeg support" )
24
26
25
27
if (RTS_BUILD_ZEROHOUR )
@@ -47,7 +49,11 @@ if(NOT IS_VS6_BUILD)
47
49
target_compile_features (core_config INTERFACE cxx_std_20 )
48
50
endif ()
49
51
50
- target_compile_options (core_config INTERFACE ${RTS_FLAGS} )
52
+ if (IS_VS6_BUILD AND RTS_BUILD_OPTION_VC6_FULL_DEBUG )
53
+ target_compile_options (core_config INTERFACE ${RTS_FLAGS} /Zi )
54
+ else ()
55
+ target_compile_options (core_config INTERFACE ${RTS_FLAGS} )
56
+ endif ()
51
57
52
58
# This disables a lot of warnings steering developers to use windows only functions/function names.
53
59
if (MSVC )
You can’t perform that action at this time.
0 commit comments