indra/newview/CMakeLists.txt

changeset 1628
907de988cd77
parent 1088
ff19876ccb10
child 1638
bd909582d0bf
     1.1 --- a/indra/newview/CMakeLists.txt	Mon Jul 11 19:31:04 2011 -0700
     1.2 +++ b/indra/newview/CMakeLists.txt	Thu Jul 14 17:34:37 2011 -0700
     1.3 @@ -1371,10 +1371,13 @@
     1.4  
     1.5  if (WINDOWS)
     1.6      if(MSVC71)
     1.7 -        set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /MAPINFO:LINES")
     1.8 +        set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /MAPINFO:LINES /LARGEADDRESSAWARE")
     1.9      else(MSVC71)
    1.10 -        set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map")
    1.11 +        set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /LARGEADDRESSAWARE")
    1.12      endif(MSVC71)
    1.13 +    if (MSVC10) 
    1.14 +        set(release_flags "/MAPRelease/${VIEWER_BINARY_NAME}.map /LARGEADDRESSAWARE") 
    1.15 +    endif(MSVC10) 
    1.16      
    1.17      set_target_properties(${VIEWER_BINARY_NAME}
    1.18          PROPERTIES
    1.19 @@ -1384,19 +1387,19 @@
    1.20          )
    1.21  
    1.22      # sets the 'working directory' for debugging from visual studio.
    1.23 -    if (NOT UNATTENDED)
    1.24 -        add_custom_command(
    1.25 -            TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
    1.26 -            COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe
    1.27 -            ARGS
    1.28 -              --solution 
    1.29 -              ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln
    1.30 -              --workingdir
    1.31 -              ${VIEWER_BINARY_NAME}
    1.32 -              ${CMAKE_CURRENT_SOURCE_DIR}
    1.33 -            COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging."
    1.34 -            )
    1.35 -    endif (NOT UNATTENDED)
    1.36 +    #if (NOT UNATTENDED)
    1.37 +    #    add_custom_command(
    1.38 +    #        TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
    1.39 +    #        COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe
    1.40 +    #        ARGS
    1.41 +    #          --solution 
    1.42 +    #          ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln
    1.43 +    #          --workingdir
    1.44 +    #          ${VIEWER_BINARY_NAME}
    1.45 +    #          ${CMAKE_CURRENT_SOURCE_DIR}
    1.46 +    #        COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging."
    1.47 +    #        )
    1.48 +    #endif (NOT UNATTENDED)
    1.49  
    1.50      add_custom_command(
    1.51          TARGET ${VIEWER_BINARY_NAME} PRE_BUILD

mercurial