make/lib/PlatformLibraries.gmk

*** 1,7 ****
  #
! # Copyright (c) 2011, 2013, 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, 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
*** 158,168 ****
                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), \
            OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawtaccessbridge$1, \
            DEBUG_SYMBOLS := true)
  
        $$(BUILD_JAWTACCESSBRIDGE$1): $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX)
  
--- 158,171 ----
                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", \
            OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawtaccessbridge$1, \
            DEBUG_SYMBOLS := true)
  
        $$(BUILD_JAWTACCESSBRIDGE$1): $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX)
  
*** 181,191 ****
                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), \
            OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavaaccessbridge$1, \
            DEBUG_SYMBOLS := true)
  
        $(call SetupNativeCompilation,BUILD_WINDOWSACCESSBRIDGE$1, \
            LIBRARY = WindowsAccessBridge$1, \
--- 184,197 ----
                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", \
            OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavaaccessbridge$1, \
            DEBUG_SYMBOLS := true)
  
        $(call SetupNativeCompilation,BUILD_WINDOWSACCESSBRIDGE$1, \
            LIBRARY = WindowsAccessBridge$1, \
*** 203,213 ****
                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)/WinAccessBridge.DEF, \
            VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \
!           RC_FLAGS := $(RC_FLAGS), \
            OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libwindowsaccessbridge$1, \
            DEBUG_SYMBOLS := true)
  
        BUILD_LIBRARIES += $$(BUILD_JAWTACCESSBRIDGE$1) $$(BUILD_JAVAACCESSBRIDGE$1) \
            $$(BUILD_WINDOWSACCESSBRIDGE$1)
--- 209,222 ----
                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)/WinAccessBridge.DEF, \
            VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \
!           RC_FLAGS := $(RC_FLAGS) \
!               -D "JDK_FNAME=WindowsAccessBridge$1.dll" \
!               -D "JDK_INTERNAL_NAME=WindowsAccessBridge$1" \
!               -D "JDK_FTYPE=0x02L", \
            OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libwindowsaccessbridge$1, \
            DEBUG_SYMBOLS := true)
  
        BUILD_LIBRARIES += $$(BUILD_JAWTACCESSBRIDGE$1) $$(BUILD_JAVAACCESSBRIDGE$1) \
            $$(BUILD_WINDOWSACCESSBRIDGE$1)