make/lib/PlatformLibraries.gmk

*** 141,161 ****
      ACCESSBRIDGE_SRCDIR := $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge
  
      define SetupAccessBridge
        # Parameter 1 Suffix
        # Parameter 2 Machine
!       # Parameter 3 ACCESSBRIDGE_ARCH_ suffix
  
        $(call SetupNativeCompilation,BUILD_JAWTACCESSBRIDGE$1, \
            LIBRARY = JAWTAccessBridge$1, \
            OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
            SRC := $(ACCESSBRIDGE_SRCDIR), \
            INCLUDE_FILES := JAWTAccessBridge.cpp, \
            LANG := C++, \
            OPTIMIZATION := LOW, \
            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, \
--- 141,163 ----
      ACCESSBRIDGE_SRCDIR := $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge
  
      define SetupAccessBridge
        # Parameter 1 Suffix
        # Parameter 2 Machine
!       # Parameter 3 ACCESSBRIDGE_ARCH_ suffix and name of directory where gensrc headers
!       #             are found.
  
        $(call SetupNativeCompilation,BUILD_JAWTACCESSBRIDGE$1, \
            LIBRARY = JAWTAccessBridge$1, \
            OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
            SRC := $(ACCESSBRIDGE_SRCDIR), \
            INCLUDE_FILES := JAWTAccessBridge.cpp, \
            LANG := C++, \
            OPTIMIZATION := LOW, \
            CFLAGS := $(CFLAGS_JDKLIB) \
!               -DACCESSBRIDGE_ARCH_$3 \
!               -I$(JDK_OUTPUTDIR)/gensrc_headers_ab/$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, \
*** 177,187 ****
                AccessBridgeJavaEntryPoints.cpp \
                AccessBridgeMessages.cpp JavaAccessBridge.cpp, \
            LANG := C++, \
            OPTIMIZATION := LOW, \
            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, \
--- 179,190 ----
                AccessBridgeJavaEntryPoints.cpp \
                AccessBridgeMessages.cpp JavaAccessBridge.cpp, \
            LANG := C++, \
            OPTIMIZATION := LOW, \
            CFLAGS := $(CFLAGS_JDKLIB) \
!               -DACCESSBRIDGE_ARCH_$3 \
!               -I$(JDK_OUTPUTDIR)/gensrc_headers_ab/$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, \
*** 202,212 ****
                WinAccessBridge.cpp AccessBridgeDebug.cpp \
                AccessBridgeEventHandler.cpp, \
            LANG := C++, \
            OPTIMIZATION := LOW, \
            CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT \
!               -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)/WinAccessBridge.DEF, \
--- 205,216 ----
                WinAccessBridge.cpp AccessBridgeDebug.cpp \
                AccessBridgeEventHandler.cpp, \
            LANG := C++, \
            OPTIMIZATION := LOW, \
            CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT \
!               -DACCESSBRIDGE_ARCH_$3 \
!               -I$(JDK_OUTPUTDIR)/gensrc_headers_ab/$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)/WinAccessBridge.DEF, \
*** 223,233 ****
  
      endef
  
      ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
        $(eval $(call SetupAccessBridge,-32,I386,32))
!       $(eval $(call SetupAccessBridge,,I386,LEGACY))
      else
        $(eval $(call SetupAccessBridge,-64,X64,64))
      endif
    endif
  endif
--- 227,237 ----
  
      endef
  
      ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
        $(eval $(call SetupAccessBridge,-32,I386,32))
!       $(eval $(call SetupAccessBridge,,I386,legacy))
      else
        $(eval $(call SetupAccessBridge,-64,X64,64))
      endif
    endif
  endif