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 |
33 JAVA_AB_SRCDIR := $(ROOT_SRCDIR)/libjavaaccessbridge $(ROOT_SRCDIR)/common |
34 WIN_AB_SRCDIR := $(ROOT_SRCDIR)/libwindowsaccessbridge $(ROOT_SRCDIR)/common |
34 WIN_AB_SRCDIR := $(ROOT_SRCDIR)/libwindowsaccessbridge $(ROOT_SRCDIR)/common |
35 SYSINFO_SRCDIR := $(ROOT_SRCDIR)/libjabsysinfo |
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 |
36 |
40 define SetupJavaDLL |
37 define SetupJavaDLL |
41 # Parameter 1 Suffix |
38 # Parameter 1 Suffix |
42 # Parameter 2 ACCESSBRIDGE_ARCH_ suffix |
39 # Parameter 2 ACCESSBRIDGE_ARCH_ suffix |
43 |
40 |
44 $(call SetupJdkLibrary, BUILD_JAVAACCESSBRIDGE$1, \ |
41 $(call SetupJdkLibrary, BUILD_JAVAACCESSBRIDGE$1, \ |
45 NAME := javaaccessbridge$1, \ |
42 NAME := javaaccessbridge$1, \ |
46 SRC := $(JAVA_AB_SRCDIR), \ |
43 SRC := $(JAVA_AB_SRCDIR), \ |
47 OPTIMIZATION := LOW, \ |
44 OPTIMIZATION := LOW, \ |
48 DISABLED_WARNINGS_microsoft := 4311 4302 4312, \ |
45 DISABLED_WARNINGS_microsoft := 4311 4302 4312, \ |
49 CFLAGS := $(CFLAGS_JDKLIB) $(ACCESSBRIDGE_CFLAGS) \ |
46 CFLAGS := $(CFLAGS_JDKLIB) \ |
50 $(addprefix -I,$(JAVA_AB_SRCDIR)) \ |
|
51 -I$(ROOT_SRCDIR)/include/bridge \ |
|
52 -DACCESSBRIDGE_ARCH_$2, \ |
47 -DACCESSBRIDGE_ARCH_$2, \ |
|
48 HEADER_FLAGS := \ |
|
49 -I$(SUPPORT_OUTPUTDIR)/headers/jdk.accessibility \ |
|
50 -I$(TOPDIR)/src/java.desktop/windows/native/include \ |
|
51 -I$(TOPDIR)/src/java.desktop/share/native/include |
|
52 -I$(ROOT_SRCDIR)/include/bridge, \ |
53 LDFLAGS := $(LDFLAGS_JDKLIB), \ |
53 LDFLAGS := $(LDFLAGS_JDKLIB), \ |
54 LIBS := kernel32.lib user32.lib gdi32.lib \ |
54 LIBS := kernel32.lib user32.lib gdi32.lib \ |
55 winspool.lib comdlg32.lib advapi32.lib shell32.lib \ |
55 winspool.lib comdlg32.lib advapi32.lib shell32.lib \ |
56 $(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib \ |
56 $(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib \ |
57 ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib, \ |
57 ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib, \ |
69 $(call SetupJdkLibrary, BUILD_WINDOWSACCESSBRIDGE$1, \ |
69 $(call SetupJdkLibrary, BUILD_WINDOWSACCESSBRIDGE$1, \ |
70 NAME := windowsaccessbridge$1, \ |
70 NAME := windowsaccessbridge$1, \ |
71 SRC := $(WIN_AB_SRCDIR), \ |
71 SRC := $(WIN_AB_SRCDIR), \ |
72 OPTIMIZATION := LOW, \ |
72 OPTIMIZATION := LOW, \ |
73 DISABLED_WARNINGS_microsoft := 4311 4302 4312, \ |
73 DISABLED_WARNINGS_microsoft := 4311 4302 4312, \ |
74 CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT $(ACCESSBRIDGE_CFLAGS) \ |
74 CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT \ |
75 $(addprefix -I,$(WIN_AB_SRCDIR)) \ |
|
76 -I$(ROOT_SRCDIR)/include/bridge \ |
|
77 -DACCESSBRIDGE_ARCH_$2, \ |
75 -DACCESSBRIDGE_ARCH_$2, \ |
|
76 HEADER_FLAGS := \ |
|
77 -I$(SUPPORT_OUTPUTDIR)/headers/jdk.accessibility \ |
|
78 -I$(TOPDIR)/src/java.desktop/windows/native/include \ |
|
79 -I$(TOPDIR)/src/java.desktop/share/native/include |
|
80 -I$(ROOT_SRCDIR)/include/bridge, \ |
78 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
81 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
79 -def:$(ROOT_SRCDIR)/libwindowsaccessbridge/WinAccessBridge.DEF, \ |
82 -def:$(ROOT_SRCDIR)/libwindowsaccessbridge/WinAccessBridge.DEF, \ |
80 LIBS := kernel32.lib user32.lib gdi32.lib \ |
83 LIBS := kernel32.lib user32.lib gdi32.lib \ |
81 winspool.lib comdlg32.lib advapi32.lib shell32.lib \ |
84 winspool.lib comdlg32.lib advapi32.lib shell32.lib \ |
82 ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib, \ |
85 ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib, \ |
91 |
94 |
92 $(call SetupJdkLibrary, BUILD_ACCESSBRIDGESYSINFO, \ |
95 $(call SetupJdkLibrary, BUILD_ACCESSBRIDGESYSINFO, \ |
93 NAME := jabsysinfo, \ |
96 NAME := jabsysinfo, \ |
94 SRC := $(SYSINFO_SRCDIR), \ |
97 SRC := $(SYSINFO_SRCDIR), \ |
95 OPTIMIZATION := LOW, \ |
98 OPTIMIZATION := LOW, \ |
96 CFLAGS := $(CFLAGS_JDKLIB) $(ACCESSBRIDGE_CFLAGS), \ |
99 CFLAGS := $(CFLAGS_JDKLIB), \ |
|
100 HEADER_FLAGS := \ |
|
101 -I$(SUPPORT_OUTPUTDIR)/headers/jdk.accessibility \ |
|
102 -I$(TOPDIR)/src/java.desktop/windows/native/include \ |
|
103 -I$(TOPDIR)/src/java.desktop/share/native/include, \ |
97 LDFLAGS := $(LDFLAGS_JDKLIB), \ |
104 LDFLAGS := $(LDFLAGS_JDKLIB), \ |
98 VERSIONINFO_RESOURCE := $(ROOT_SRCDIR)/common/AccessBridgeStatusWindow.rc, \ |
105 VERSIONINFO_RESOURCE := $(ROOT_SRCDIR)/common/AccessBridgeStatusWindow.rc, \ |
99 ) |
106 ) |
100 |
107 |
101 TARGETS += $$(BUILD_ACCESSBRIDGESYSINFO) |
108 TARGETS += $$(BUILD_ACCESSBRIDGESYSINFO) |