jdk/make/lib/PlatformLibraries.gmk

*** 1,7 ****
  #
! # Copyright (c) 2011, 2014, 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) 2011, 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
*** 125,138 ****
  
  endif
  
  ##########################################################################################
  
! ifndef OPENJDK
!   ifeq ($(OPENJDK_TARGET_OS), windows)
  
!     ACCESSBRIDGE_SRCDIR := $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge
  
      define SetupAccessBridge
        # Parameter 1 Suffix
        # Parameter 2 Machine
        # Parameter 3 ACCESSBRIDGE_ARCH_ suffix
--- 125,137 ----
  
  endif
  
  ##########################################################################################
  
! ifeq ($(OPENJDK_TARGET_OS), windows)
  
!     ACCESSBRIDGE_SRCDIR := $(JDK_TOPDIR)/src/windows/native/sun/bridge
  
      define SetupAccessBridge
        # Parameter 1 Suffix
        # Parameter 2 Machine
        # Parameter 3 ACCESSBRIDGE_ARCH_ suffix
*** 147,158 ****
            CFLAGS := $(CFLAGS_JDKLIB) \
                -DACCESSBRIDGE_ARCH_$3, \
            LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
                winspool.lib jawt.lib comdlg32.lib advapi32.lib shell32.lib \
                ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
!               -subsystem:windows -machine:$2 \
!               -def:$(ACCESSBRIDGE_SRCDIR)/JAWTAccessBridge.DEF, \
            VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \
            RC_FLAGS := $(RC_FLAGS) \
                -D "JDK_FNAME=JAWTAccessBridge$1.dll" \
                -D "JDK_INTERNAL_NAME=JAWTAccessBridge$1" \
                -D "JDK_FTYPE=0x02L", \
--- 146,156 ----
            CFLAGS := $(CFLAGS_JDKLIB) \
                -DACCESSBRIDGE_ARCH_$3, \
            LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
                winspool.lib jawt.lib comdlg32.lib advapi32.lib shell32.lib \
                ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
!               -subsystem:windows -machine:$2, \
            VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \
            RC_FLAGS := $(RC_FLAGS) \
                -D "JDK_FNAME=JAWTAccessBridge$1.dll" \
                -D "JDK_INTERNAL_NAME=JAWTAccessBridge$1" \
                -D "JDK_FTYPE=0x02L", \
*** 173,184 ****
            CFLAGS := $(CFLAGS_JDKLIB) \
                -DACCESSBRIDGE_ARCH_$3, \
            LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
                winspool.lib comdlg32.lib advapi32.lib shell32.lib \
                ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
!               -subsystem:windows -machine:$2 \
!               -def:$(ACCESSBRIDGE_SRCDIR)/JavaAccessBridge.DEF, \
            VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \
            RC_FLAGS := $(RC_FLAGS) \
                -D "JDK_FNAME=JavaAccessBridge$1.dll" \
                -D "JDK_INTERNAL_NAME=JavaAccessBridge$1" \
                -D "JDK_FTYPE=0x02L", \
--- 171,181 ----
            CFLAGS := $(CFLAGS_JDKLIB) \
                -DACCESSBRIDGE_ARCH_$3, \
            LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
                winspool.lib comdlg32.lib advapi32.lib shell32.lib \
                ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
!               -subsystem:windows -machine:$2, \
            VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \
            RC_FLAGS := $(RC_FLAGS) \
                -D "JDK_FNAME=JavaAccessBridge$1.dll" \
                -D "JDK_INTERNAL_NAME=JavaAccessBridge$1" \
                -D "JDK_FTYPE=0x02L", \
*** 219,225 ****
        $(eval $(call SetupAccessBridge,-32,I386,32))
        $(eval $(call SetupAccessBridge,,I386,LEGACY))
      else
        $(eval $(call SetupAccessBridge,-64,X64,64))
      endif
!   endif
  endif
--- 216,222 ----
        $(eval $(call SetupAccessBridge,-32,I386,32))
        $(eval $(call SetupAccessBridge,,I386,LEGACY))
      else
        $(eval $(call SetupAccessBridge,-64,X64,64))
      endif
! 
  endif