|
@@ -60,11 +60,11 @@ if(MSVC)
|
|
|
set(BS_LINKER_FLAGS_COMMON "/DYNAMICBASE /NOLOGO")
|
|
set(BS_LINKER_FLAGS_COMMON "/DYNAMICBASE /NOLOGO")
|
|
|
|
|
|
|
|
set(BS_LINKER_FLAGS_DEBUG "${BS_LINKER_FLAGS_COMMON} /DEBUG")
|
|
set(BS_LINKER_FLAGS_DEBUG "${BS_LINKER_FLAGS_COMMON} /DEBUG")
|
|
|
- set(BS_LINKER_FLAGS_OPTIMIZEDDEBUG "${BS_LINKER_FLAGS_COMMON} /LTCG:incremental /OPT:REF /DEBUG")
|
|
|
|
|
|
|
+ set(BS_LINKER_FLAGS_OPTIMIZEDDEBUG "${BS_LINKER_FLAGS_COMMON} /LTCG:incremental /INCREMENTAL:NO /OPT:REF /DEBUG")
|
|
|
set(BS_LINKER_FLAGS_RELEASE "${BS_LINKER_FLAGS_COMMON} /LTCG /INCREMENTAL:NO /OPT:REF")
|
|
set(BS_LINKER_FLAGS_RELEASE "${BS_LINKER_FLAGS_COMMON} /LTCG /INCREMENTAL:NO /OPT:REF")
|
|
|
|
|
|
|
|
if(BS_64BIT)
|
|
if(BS_64BIT)
|
|
|
- set(BS_LINKER_FLAGS_OPTIMIZEDDEBUG "${BS_LINKER_FLAGS_OPTIMIZEDDEBUG} /OPT:ICF /INCREMENTAL:NO")
|
|
|
|
|
|
|
+ set(BS_LINKER_FLAGS_OPTIMIZEDDEBUG "${BS_LINKER_FLAGS_OPTIMIZEDDEBUG} /OPT:ICF")
|
|
|
set(BS_LINKER_FLAGS_RELEASE "${BS_LINKER_FLAGS_RELEASE} /OPT:ICF")
|
|
set(BS_LINKER_FLAGS_RELEASE "${BS_LINKER_FLAGS_RELEASE} /OPT:ICF")
|
|
|
endif()
|
|
endif()
|
|
|
|
|
|
|
@@ -93,7 +93,7 @@ if(MSVC)
|
|
|
endif()
|
|
endif()
|
|
|
|
|
|
|
|
set(CMAKE_CXX_FLAGS_OPTIMIZEDDEBUG "${BS_COMPILER_FLAGS_COMMON} /GL /Gy /Zi /Gm /O2 /Oi /MD")
|
|
set(CMAKE_CXX_FLAGS_OPTIMIZEDDEBUG "${BS_COMPILER_FLAGS_COMMON} /GL /Gy /Zi /Gm /O2 /Oi /MD")
|
|
|
- set(CMAKE_CXX_FLAGS_RELEASE "${BS_COMPILER_FLAGS_COMMON} /GL /Gy /O2 /Oi /MD /MP")
|
|
|
|
|
|
|
+ set(CMAKE_CXX_FLAGS_RELEASE "${BS_COMPILER_FLAGS_COMMON} /GL /Gy /O2 /Oi /MD")
|
|
|
|
|
|
|
|
# Global defines
|
|
# Global defines
|
|
|
add_definitions(-D_HAS_EXCEPTIONS=0)
|
|
add_definitions(-D_HAS_EXCEPTIONS=0)
|