aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-10-02 05:36:01 -0700
committerMcCabe Maxsted2010-10-02 05:36:01 -0700
commited5f83dffd90ca2b2ffc66709789cafacb2083b0 (patch)
treea09cc596093e4b99f4a67f55149159e8bd75062c
parentApplied patch by Ansariel Hiller for #568: reload balance option in the advan... (diff)
downloadmeta-impy-ed5f83dffd90ca2b2ffc66709789cafacb2083b0.zip
meta-impy-ed5f83dffd90ca2b2ffc66709789cafacb2083b0.tar.gz
meta-impy-ed5f83dffd90ca2b2ffc66709789cafacb2083b0.tar.bz2
meta-impy-ed5f83dffd90ca2b2ffc66709789cafacb2083b0.tar.xz
#489: added /LARGEADDRESSAWARE to the Windows linker command line settings
-rw-r--r--linden/indra/newview/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index f762923..9260b75 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1256,9 +1256,9 @@ add_custom_target(
1256 1256
1257if (WINDOWS) 1257if (WINDOWS)
1258 if(MSVC71) 1258 if(MSVC71)
1259 set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /MAPINFO:LINES") 1259 set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /MAPINFO:LINES /LARGEADDRESSAWARE")
1260 else(MSVC71) 1260 else(MSVC71)
1261 set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map") 1261 set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /LARGEADDRESSAWARE")
1262 endif(MSVC71) 1262 endif(MSVC71)
1263 1263
1264 set_target_properties(${VIEWER_BINARY_NAME} 1264 set_target_properties(${VIEWER_BINARY_NAME}