make/launcher/Launcher-jdk.accessibility.gmk
changeset 49244 995a5556edfa
parent 49070 d7859531621b
child 53683 48ff68e2fe5c
child 56723 d927981eeb64
equal deleted inserted replaced
49243:176b3da8ce61 49244:995a5556edfa
    31 ifeq ($(OPENJDK_TARGET_OS), windows)
    31 ifeq ($(OPENJDK_TARGET_OS), windows)
    32 
    32 
    33   JABSWITCH_SRC := $(TOPDIR)/src/jdk.accessibility/windows/native/jabswitch
    33   JABSWITCH_SRC := $(TOPDIR)/src/jdk.accessibility/windows/native/jabswitch
    34   ACCESSBRIDGE_SRC := $(TOPDIR)/src/jdk.accessibility/windows/native/common
    34   ACCESSBRIDGE_SRC := $(TOPDIR)/src/jdk.accessibility/windows/native/common
    35 
    35 
    36   $(eval $(call SetupNativeCompilation, BUILD_JABSWITCH, \
    36   $(eval $(call SetupJdkExecutable, BUILD_JABSWITCH, \
    37       NAME := jabswitch, \
    37       NAME := jabswitch, \
    38       TYPE := EXECUTABLE, \
       
    39       SRC := $(JABSWITCH_SRC), \
    38       SRC := $(JABSWITCH_SRC), \
    40       INCLUDE_FILES := jabswitch.cpp, \
    39       INCLUDE_FILES := jabswitch.cpp, \
    41       CFLAGS := $(filter-out -Zc:wchar_t-, $(CFLAGS_JDKEXE)) -Zc:wchar_t \
    40       CFLAGS := $(filter-out -Zc:wchar_t-, $(CFLAGS_JDKEXE)) -Zc:wchar_t \
    42           -analyze- -Od -Gd -D_WINDOWS \
    41           -analyze- -Od -Gd -D_WINDOWS \
    43           -D_UNICODE -DUNICODE -RTC1 -EHsc, \
    42           -D_UNICODE -DUNICODE -RTC1 -EHsc, \
    44       DISABLED_WARNINGS_microsoft := 4267 4996, \
    43       DISABLED_WARNINGS_microsoft := 4267 4996, \
    45       LDFLAGS := $(LDFLAGS_JDKEXE), \
    44       LDFLAGS := $(LDFLAGS_JDKEXE), \
    46       LIBS := advapi32.lib version.lib user32.lib, \
    45       LIBS := advapi32.lib version.lib user32.lib, \
    47       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/jdk.accessibility/jabswitch, \
       
    48       OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_cmds/jdk.accessibility, \
       
    49       VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRC)/AccessBridgeStatusWindow.RC, \
    46       VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRC)/AccessBridgeStatusWindow.RC, \
    50       RC_FLAGS := $(RC_FLAGS) \
       
    51           -D "JDK_FNAME=jabswitch.exe" \
       
    52           -D "JDK_INTERNAL_NAME=jabswitch" \
       
    53           -D "JDK_FTYPE=0x01L", \
       
    54       MANIFEST := $(JABSWITCH_SRC)/jabswitch.manifest, \
    47       MANIFEST := $(JABSWITCH_SRC)/jabswitch.manifest, \
    55       MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \
    48       MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \
    56   ))
    49   ))
    57 
    50 
    58   TARGETS += $(BUILD_JABSWITCH)
    51   TARGETS += $(BUILD_JABSWITCH)
    68 
    61 
    69   define SetupInspector
    62   define SetupInspector
    70   # Parameter 1 File name suffix
    63   # Parameter 1 File name suffix
    71   # Parameter 2 ACCESSBRIDGE_ARCH_ -D suffix
    64   # Parameter 2 ACCESSBRIDGE_ARCH_ -D suffix
    72 
    65 
    73     $$(eval $$(call SetupNativeCompilation, BUILD_JACCESSINSPECTOR$1, \
    66     $$(eval $$(call SetupJdkExecutable, BUILD_JACCESSINSPECTOR$1, \
    74       NAME := jaccessinspector$1, \
    67       NAME := jaccessinspector$1, \
    75       TYPE := EXECUTABLE, \
       
    76       SRC := $(TOPDIR)/jaccessinspector $(TOPDIR)/common \
    68       SRC := $(TOPDIR)/jaccessinspector $(TOPDIR)/common \
    77           $(TOPDIR)/toolscommon $(TOPDIR)/bridge, \
    69           $(TOPDIR)/toolscommon $(TOPDIR)/bridge, \
    78       CFLAGS := $$(CFLAGS_JDKEXE) $(TOOLS_CFLAGS) -DACCESSBRIDGE_ARCH_$2 -EHsc, \
    70       CFLAGS := $$(CFLAGS_JDKEXE) $(TOOLS_CFLAGS) -DACCESSBRIDGE_ARCH_$2 -EHsc, \
    79       LDFLAGS := $$(LDFLAGS_JDKEXE) -stack:655360, \
    71       LDFLAGS := $$(LDFLAGS_JDKEXE) -stack:655360, \
    80       LIBS := advapi32.lib user32.lib, \
    72       LIBS := advapi32.lib user32.lib, \
    81       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/jdk.accessibility/jaccessinspector$1, \
       
    82       OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_cmds/jdk.accessibility, \
       
    83       VERSIONINFO_RESOURCE := $(TOPDIR)/jaccessinspector/jaccessinspectorWindow.rc, \
    73       VERSIONINFO_RESOURCE := $(TOPDIR)/jaccessinspector/jaccessinspectorWindow.rc, \
    84       RC_FLAGS := $$(RC_FLAGS) \
       
    85           -D "JDK_FNAME=jaccessinspector$1.exe" \
       
    86           -D "JDK_INTERNAL_NAME=jaccessinspector$1" \
       
    87           -D "JDK_FTYPE=0x01L", \
       
    88     ))
    74     ))
    89 
    75 
    90     TARGETS += $$(BUILD_JACCESSINSPECTOR$1)
    76     TARGETS += $$(BUILD_JACCESSINSPECTOR$1)
    91 
    77 
    92   endef
    78   endef
    96 
    82 
    97   define SetupWalker
    83   define SetupWalker
    98   # Parameter 1 File name suffix
    84   # Parameter 1 File name suffix
    99   # Parameter 2 ACCESSBRIDGE_ARCH_ -D suffix
    85   # Parameter 2 ACCESSBRIDGE_ARCH_ -D suffix
   100 
    86 
   101     $$(eval $$(call SetupNativeCompilation, BUILD_JACCESSWALKER$1, \
    87     $$(eval $$(call SetupJdkExecutable, BUILD_JACCESSWALKER$1, \
   102       NAME := jaccesswalker$1, \
    88       NAME := jaccesswalker$1, \
   103       TYPE := EXECUTABLE, \
       
   104       SRC := $(TOPDIR)/jaccesswalker $(TOPDIR)/common \
    89       SRC := $(TOPDIR)/jaccesswalker $(TOPDIR)/common \
   105           $(TOPDIR)/toolscommon $(TOPDIR)/bridge, \
    90           $(TOPDIR)/toolscommon $(TOPDIR)/bridge, \
   106       CFLAGS := $$(CFLAGS_JDKEXE) $(TOOLS_CFLAGS) -DACCESSBRIDGE_ARCH_$2 -EHsc, \
    91       CFLAGS := $$(CFLAGS_JDKEXE) $(TOOLS_CFLAGS) -DACCESSBRIDGE_ARCH_$2 -EHsc, \
   107       LDFLAGS := $$(LDFLAGS_JDKEXE) -stack:655360, \
    92       LDFLAGS := $$(LDFLAGS_JDKEXE) -stack:655360, \
   108       LIBS := advapi32.lib comctl32.lib gdi32.lib user32.lib, \
    93       LIBS := advapi32.lib comctl32.lib gdi32.lib user32.lib, \
   109       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/jdk.accessibility/jaccesswalker$1, \
       
   110       OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_cmds/jdk.accessibility, \
       
   111       VERSIONINFO_RESOURCE := $(TOPDIR)/jaccesswalker/jaccesswalkerWindow.rc, \
    94       VERSIONINFO_RESOURCE := $(TOPDIR)/jaccesswalker/jaccesswalkerWindow.rc, \
   112       RC_FLAGS := $$(RC_FLAGS) \
       
   113           -D "JDK_FNAME=jaccesswalker$1.exe" \
       
   114           -D "JDK_INTERNAL_NAME=jaccesswalker$1" \
       
   115           -D "JDK_FTYPE=0x01L", \
       
   116    ))
    95    ))
   117 
    96 
   118     TARGETS += $$(BUILD_JACCESSWALKER$1)
    97     TARGETS += $$(BUILD_JACCESSWALKER$1)
   119 
    98 
   120   endef
    99   endef