Skip to content

Commit b3b36eb

Browse files
authored
Update CMake BUILD_SHARED_LIBS=ON linker settings (#639)
1 parent a180897 commit b3b36eb

2 files changed

Lines changed: 17 additions & 1 deletion

File tree

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: branch_classification
2+
description: Branch classification configuration for repository
3+
resource: repository
4+
disabled: false
5+
where:
6+
configuration:
7+
branchClassificationSettings:
8+
defaultClassification: nonproduction
9+
ruleset:
10+
- name: prod-branches
11+
branchNames:
12+
- main
13+
- ms_1.7.6_release
14+
- release
15+
classification: production

‎build/CompilerAndLinker.cmake‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ endif()
6868
#--- General MSVC-like SDL options
6969
if(MSVC)
7070
list(APPEND COMPILER_SWITCHES /Gd /GS /Zc:forScope /Zc:inline /Zc:wchar_t $<$<NOT:$<CONFIG:DEBUG>>:/guard:cf>)
71-
list(APPEND LINKER_SWITCHES /DYNAMICBASE /NXCOMPAT /INCREMENTAL:NO)
71+
list(APPEND LINKER_SWITCHES /DYNAMICBASE /NXCOMPAT /INCREMENTAL:NO $<$<CONFIG:RELWITHDEBINFO>:/OPT:REF,ICF>)
7272

7373
if(WINDOWS_STORE)
7474
list(APPEND COMPILER_SWITCHES /bigobj)
@@ -131,6 +131,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
131131
list(APPEND COMPILER_SWITCHES /Zc:__cplusplus /Zc:inline /fp:fast /Qdiag-disable:161)
132132
elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
133133
list(APPEND COMPILER_SWITCHES /sdl /fp:fast)
134+
list(APPEND LINKER_SWITCHES $<$<CONFIG:RELWITHDEBINFO>:/DEBUG:FULL /DEBUGTYPE:CV,FIXUP /OPT:REF,ICF>)
134135

135136
if(WINDOWS_STORE)
136137
list(APPEND COMPILER_SWITCHES /await)

0 commit comments

Comments
 (0)