summaryrefslogtreecommitdiffhomepage
path: root/cmake/msvc.cmake
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-08-23 14:51:37 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-08-23 14:51:37 +0200
commitf0a861a7c9a23bc761ffb3271586de7253c0b63e (patch)
tree8b0d1437b8f6fe815c461d94ceaaac5000c77a77 /cmake/msvc.cmake
parent03dd804c1d9f82a4b87610461f1bb75c1d593e0e (diff)
cmake/msvc: typo
Diffstat (limited to 'cmake/msvc.cmake')
-rw-r--r--cmake/msvc.cmake6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/msvc.cmake b/cmake/msvc.cmake
index 61932d42..03053d77 100644
--- a/cmake/msvc.cmake
+++ b/cmake/msvc.cmake
@@ -14,7 +14,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
# oldest CPU supported here is Northwood-based Pentium 4. -sh 20150811
set(cc "/Ox /arch:SSE2 /EHscr /fp:fast /GS- /GF /GL /GR- /Gy /MD /Y- /Zi /MP /W1")
-set(silly "/bigobj -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS -D_ITERATOR_DEBUG_LEVEL=0 -D_HAS_ITERATOR_DEBUGGING=0 -D_SECURE_SCL=0")
+set(silly "-DNOMINMAX -D_CRT_SECURE_NO_WARNINGS -D_ITERATOR_DEBUG_LEVEL=0 -D_HAS_ITERATOR_DEBUGGING=0 -D_SECURE_SCL=0")
set(_CFLAGS "${silly}")
set(_CXXFLAGS "${silly}")
@@ -23,7 +23,7 @@ set(_CFLAGS_DEBUG "/Zi /GS")
set(_CXXFLAGS_RELEASE "${cc}")
set(_CXXFLAGS_DEBUG "/Zi /GS")
-set(ldflags-shared-release "/OPT:REF,ICF=10")
+set(ldflags-shared-release "/OPT:REF /OPT:ICF=10")
set(ldflags-shared "/DEBUG /DYNAMICBASE /NXCOMPAT")
foreach (i MODULE EXE SHARED)
@@ -46,7 +46,7 @@ endforeach()
foreach(j "" _DEBUG _RELEASE)
foreach(i MODULE EXE SHARED STATIC)
set(OVERRIDE_LDFLAGS${j} "" CACHE STRING "")
- set(CMAKE_${i}_LINKER_FLAGS${j} "${_LDFLAGS${j}} ${_LDFLAGS_${i}} ${_LDFLAGS_${i}_${j}} ${OVERRIDE_LDFLAGS${j}}" CACHE STRING "" FORCE)
+ set(CMAKE_${i}_LINKER_FLAGS${j} "${_LDFLAGS${j}} ${_LDFLAGS_${i}} ${_LDFLAGS_${i}${j}} ${OVERRIDE_LDFLAGS${j}}" CACHE STRING "" FORCE)
endforeach()
endforeach()