make/lib/Lib-jdk.accessibility.gmk
changeset 50471 f0aeede1b855
parent 49566 7c224ec572d0
child 51820 74c67f87fe80
equal deleted inserted replaced
50470:f3aac763a315 50471:f0aeede1b855
    28 ################################################################################
    28 ################################################################################
    29 
    29 
    30 ifeq ($(OPENJDK_TARGET_OS), windows)
    30 ifeq ($(OPENJDK_TARGET_OS), windows)
    31 
    31 
    32   ROOT_SRCDIR := $(TOPDIR)/src/jdk.accessibility/windows/native
    32   ROOT_SRCDIR := $(TOPDIR)/src/jdk.accessibility/windows/native
    33   JAVA_AB_SRCDIR := $(ROOT_SRCDIR)/libjavaaccessbridge $(ROOT_SRCDIR)/common
       
    34   WIN_AB_SRCDIR := $(ROOT_SRCDIR)/libwindowsaccessbridge $(ROOT_SRCDIR)/common
       
    35   SYSINFO_SRCDIR := $(ROOT_SRCDIR)/libjabsysinfo
       
    36   ACCESSBRIDGE_CFLAGS := -I$(SUPPORT_OUTPUTDIR)/headers/jdk.accessibility \
       
    37       -I$(TOPDIR)/src/java.desktop/windows/native/include \
       
    38       -I$(TOPDIR)/src/java.desktop/share/native/include
       
    39 
    33 
    40   define SetupJavaDLL
    34   define SetupJavaDLL
    41     # Parameter 1 Suffix
    35     # Parameter 1 Suffix
    42     # Parameter 2 ACCESSBRIDGE_ARCH_ suffix
    36     # Parameter 2 ACCESSBRIDGE_ARCH_ suffix
    43 
    37 
    44     $(call SetupJdkLibrary, BUILD_JAVAACCESSBRIDGE$1, \
    38     $(call SetupJdkLibrary, BUILD_JAVAACCESSBRIDGE$1, \
    45         NAME := javaaccessbridge$1, \
    39         NAME := javaaccessbridge$1, \
    46         SRC := $(JAVA_AB_SRCDIR), \
    40         SRC := libjavaaccessbridge, \
       
    41         EXTRA_SRC := common, \
    47         OPTIMIZATION := LOW, \
    42         OPTIMIZATION := LOW, \
    48         DISABLED_WARNINGS_microsoft := 4311 4302 4312, \
    43         DISABLED_WARNINGS_microsoft := 4311 4302 4312, \
    49         CFLAGS := $(CFLAGS_JDKLIB) $(ACCESSBRIDGE_CFLAGS) \
    44         CFLAGS := $(CFLAGS_JDKLIB) \
    50             $(addprefix -I,$(JAVA_AB_SRCDIR)) \
       
    51             -I$(ROOT_SRCDIR)/include/bridge \
       
    52             -DACCESSBRIDGE_ARCH_$2, \
    45             -DACCESSBRIDGE_ARCH_$2, \
       
    46         EXTRA_HEADER_DIRS := \
       
    47             include/bridge \
       
    48             java.base:include \
       
    49             java.desktop:include, \
    53         LDFLAGS := $(LDFLAGS_JDKLIB), \
    50         LDFLAGS := $(LDFLAGS_JDKLIB), \
    54         LIBS := kernel32.lib user32.lib gdi32.lib \
    51         LIBS := kernel32.lib user32.lib gdi32.lib \
    55             winspool.lib comdlg32.lib advapi32.lib shell32.lib \
    52             winspool.lib comdlg32.lib advapi32.lib shell32.lib \
    56             $(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib \
    53             $(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib \
    57             ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib, \
    54             ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib, \
    66   define SetupWinDLL
    63   define SetupWinDLL
    67     # Parameter 1 Suffix
    64     # Parameter 1 Suffix
    68     # Parameter 2 ACCESSBRIDGE_ARCH_ suffix
    65     # Parameter 2 ACCESSBRIDGE_ARCH_ suffix
    69     $(call SetupJdkLibrary, BUILD_WINDOWSACCESSBRIDGE$1, \
    66     $(call SetupJdkLibrary, BUILD_WINDOWSACCESSBRIDGE$1, \
    70         NAME := windowsaccessbridge$1, \
    67         NAME := windowsaccessbridge$1, \
    71         SRC := $(WIN_AB_SRCDIR), \
    68         SRC := libwindowsaccessbridge, \
       
    69         EXTRA_SRC := common, \
    72         OPTIMIZATION := LOW, \
    70         OPTIMIZATION := LOW, \
    73         DISABLED_WARNINGS_microsoft := 4311 4302 4312, \
    71         DISABLED_WARNINGS_microsoft := 4311 4302 4312, \
    74         CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT $(ACCESSBRIDGE_CFLAGS) \
    72         CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT \
    75             $(addprefix -I,$(WIN_AB_SRCDIR)) \
       
    76             -I$(ROOT_SRCDIR)/include/bridge \
       
    77             -DACCESSBRIDGE_ARCH_$2, \
    73             -DACCESSBRIDGE_ARCH_$2, \
       
    74         EXTRA_HEADER_DIRS := \
       
    75             include/bridge \
       
    76             java.base:include, \
    78         LDFLAGS := $(LDFLAGS_JDKLIB) \
    77         LDFLAGS := $(LDFLAGS_JDKLIB) \
    79             -def:$(ROOT_SRCDIR)/libwindowsaccessbridge/WinAccessBridge.DEF, \
    78             -def:$(ROOT_SRCDIR)/libwindowsaccessbridge/WinAccessBridge.DEF, \
    80         LIBS := kernel32.lib user32.lib gdi32.lib \
    79         LIBS := kernel32.lib user32.lib gdi32.lib \
    81             winspool.lib comdlg32.lib advapi32.lib shell32.lib \
    80             winspool.lib comdlg32.lib advapi32.lib shell32.lib \
    82             ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib, \
    81             ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib, \
    89 
    88 
    90   define SetupAccessBridgeSysInfo
    89   define SetupAccessBridgeSysInfo
    91 
    90 
    92     $(call SetupJdkLibrary, BUILD_ACCESSBRIDGESYSINFO, \
    91     $(call SetupJdkLibrary, BUILD_ACCESSBRIDGESYSINFO, \
    93         NAME := jabsysinfo, \
    92         NAME := jabsysinfo, \
    94         SRC := $(SYSINFO_SRCDIR), \
       
    95         OPTIMIZATION := LOW, \
    93         OPTIMIZATION := LOW, \
    96         CFLAGS := $(CFLAGS_JDKLIB) $(ACCESSBRIDGE_CFLAGS), \
    94         CFLAGS := $(CFLAGS_JDKLIB), \
    97         LDFLAGS := $(LDFLAGS_JDKLIB), \
    95         LDFLAGS := $(LDFLAGS_JDKLIB), \
    98         VERSIONINFO_RESOURCE := $(ROOT_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
    96         VERSIONINFO_RESOURCE := $(ROOT_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
    99     )
    97     )
   100 
    98 
   101     TARGETS += $$(BUILD_ACCESSBRIDGESYSINFO)
    99     TARGETS += $$(BUILD_ACCESSBRIDGESYSINFO)