buildSrc/win.gradle

rev 9617 : imported patch 8u121.patch

*** 1,7 ****
  /*
!  * Copyright (c) 2013, 2015, 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.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2013, 2016, 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.  Oracle designates this
*** 110,120 ****
          "/D_STATIC_CPPLIB", "/D_DISABLE_DEPRECATE_STATIC_CPPLIB", "/DINLINE=__inline",
          "/DUNICODE", "/D_UNICODE", "/DWIN32", "/DIAL", "/D_LITTLE_ENDIAN", "/DWIN32_LEAN_AND_MEAN",
          "/I$JDK_HOME/include", "/I$JDK_HOME/include/win32",
          ccDebugFlags].flatten();
  
! def linkFlags = ["/nologo", "/dll", "/manifest", "/opt:REF", "/incremental:no"];
  if (IS_DEBUG_NATIVE) linkFlags.add("/debug");
  
  // Remove C++ static linking if not on VS2010
  if (WINDOWS_VS_VER != "100") {
      ccFlags -= ["/D_STATIC_CPPLIB", "/D_DISABLE_DEPRECATE_STATIC_CPPLIB"]
--- 110,121 ----
          "/D_STATIC_CPPLIB", "/D_DISABLE_DEPRECATE_STATIC_CPPLIB", "/DINLINE=__inline",
          "/DUNICODE", "/D_UNICODE", "/DWIN32", "/DIAL", "/D_LITTLE_ENDIAN", "/DWIN32_LEAN_AND_MEAN",
          "/I$JDK_HOME/include", "/I$JDK_HOME/include/win32",
          ccDebugFlags].flatten();
  
! def linkFlags = ["/nologo", "/dll", "/manifest", "/opt:REF", "/incremental:no", "/dynamicbase", "/nxcompat"];
! if (!IS_64) linkFlags.add("/safeseh");
  if (IS_DEBUG_NATIVE) linkFlags.add("/debug");
  
  // Remove C++ static linking if not on VS2010
  if (WINDOWS_VS_VER != "100") {
      ccFlags -= ["/D_STATIC_CPPLIB", "/D_DISABLE_DEPRECATE_STATIC_CPPLIB"]