make/windows/makefiles/compile.make

*** 1,7 ****
  #
! # Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.
--- 1,7 ----
  #
! # Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.
*** 52,63 ****
  # improving the quality of crash log stack traces involving jvm.dll.
  
  # These are always used in all compiles
  CXX_FLAGS=/nologo /W3 /WX
  
! # Let's add debug information always too.
  CXX_FLAGS=$(CXX_FLAGS) /Zi
  
  # Based on BUILDARCH we add some flags and select the default compiler name
  !if "$(BUILDARCH)" == "ia64"
  MACHINE=IA64
  DEFAULT_COMPILER_NAME=VS2003
--- 52,65 ----
  # improving the quality of crash log stack traces involving jvm.dll.
  
  # These are always used in all compiles
  CXX_FLAGS=/nologo /W3 /WX
  
! # Let's add debug information when Full Debug Symbols is enabled
! !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
  CXX_FLAGS=$(CXX_FLAGS) /Zi
+ !endif
  
  # Based on BUILDARCH we add some flags and select the default compiler name
  !if "$(BUILDARCH)" == "ia64"
  MACHINE=IA64
  DEFAULT_COMPILER_NAME=VS2003
*** 237,247 ****
  LD=link.exe
  !endif
  LD_FLAGS= $(LD_FLAGS) kernel32.lib user32.lib gdi32.lib winspool.lib \
   comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \
   uuid.lib Wsock32.lib winmm.lib /nologo /machine:$(MACHINE) /opt:REF \
!  /opt:ICF,8 /map /debug
  
  
  !if $(MSC_VER) >= 1600 
  LD_FLAGS= $(LD_FLAGS) psapi.lib
  !endif
--- 239,252 ----
  LD=link.exe
  !endif
  LD_FLAGS= $(LD_FLAGS) kernel32.lib user32.lib gdi32.lib winspool.lib \
   comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \
   uuid.lib Wsock32.lib winmm.lib /nologo /machine:$(MACHINE) /opt:REF \
!  /opt:ICF,8
! !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
! LD_FLAGS= $(LD_FLAGS) /map /debug
! !endif
  
  
  !if $(MSC_VER) >= 1600 
  LD_FLAGS= $(LD_FLAGS) psapi.lib
  !endif