Skip to content
Snippets Groups Projects
Commit 48285958 authored by David Parks's avatar David Parks
Browse files

Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010

parents c0163bb2 c77d1b3a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/CMakeLists.txt
+ 1
− 1
View file @ 48285958
...@@ -1455,7 +1455,7 @@ if (WINDOWS) ...@@ -1455,7 +1455,7 @@ if (WINDOWS)
PROPERTIES PROPERTIES
# *TODO -reenable this once we get server usage sorted out # *TODO -reenable this once we get server usage sorted out
#LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCLUDE:\"__tcmalloc\"" #LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCLUDE:\"__tcmalloc\""
LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS" LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCLUDE:__tcmalloc"
LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO" LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO"
LINK_FLAGS_RELEASE "" LINK_FLAGS_RELEASE ""
) )
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment