diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-19 12:34:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-19 12:34:03 -0400 |
| commit | d1ac85a589f92981b8031140997a21df633136e2 (patch) | |
| tree | b0854607738d5ffb86b9de8c20cc946433a15c09 | |
| parent | 84574fe30a4cb2a8822d01a5f958a005bb9d8234 (diff) | |
| parent | 361a413d25509e0055b5f0dbaae7a5a50264a84f (diff) | |
merge changes for open-142
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/cmake/00-Common.cmake | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 90a9e8ef49..221404723d 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1095,6 +1095,7 @@ Sudane Erato Synystyr Texan Takeda Terrawyng TankMaster Finesmith + OPEN-142 STORM-1100 STORM-1258 STORM-1602 diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 98eeed09b3..303f7e5608 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -51,6 +51,7 @@ if (WINDOWS) set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /Ob2 -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0" CACHE STRING "C++ compiler release options" FORCE) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE") set(CMAKE_CXX_STANDARD_LIBRARIES "") set(CMAKE_C_STANDARD_LIBRARIES "") |