39 |
39 |
40 define SetupJavaDLL |
40 define SetupJavaDLL |
41 # Parameter 1 Suffix |
41 # Parameter 1 Suffix |
42 # Parameter 2 ACCESSBRIDGE_ARCH_ suffix |
42 # Parameter 2 ACCESSBRIDGE_ARCH_ suffix |
43 |
43 |
44 $(call SetupNativeCompilation, BUILD_JAVAACCESSBRIDGE$1, \ |
44 $(call SetupJdkLibrary, BUILD_JAVAACCESSBRIDGE$1, \ |
45 NAME := javaaccessbridge$1, \ |
45 NAME := javaaccessbridge$1, \ |
46 OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
|
47 SRC := $(JAVA_AB_SRCDIR), \ |
46 SRC := $(JAVA_AB_SRCDIR), \ |
48 OPTIMIZATION := LOW, \ |
47 OPTIMIZATION := LOW, \ |
49 CFLAGS := $(CFLAGS_JDKLIB) $(ACCESSBRIDGE_CFLAGS) \ |
48 CFLAGS := $(CFLAGS_JDKLIB) $(ACCESSBRIDGE_CFLAGS) \ |
50 $(addprefix -I,$(JAVA_AB_SRCDIR)) \ |
49 $(addprefix -I,$(JAVA_AB_SRCDIR)) \ |
51 -I$(ROOT_SRCDIR)/include/bridge \ |
50 -I$(ROOT_SRCDIR)/include/bridge \ |
54 LIBS := kernel32.lib user32.lib gdi32.lib \ |
53 LIBS := kernel32.lib user32.lib gdi32.lib \ |
55 winspool.lib comdlg32.lib advapi32.lib shell32.lib \ |
54 winspool.lib comdlg32.lib advapi32.lib shell32.lib \ |
56 $(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib \ |
55 $(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib \ |
57 ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib, \ |
56 ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib, \ |
58 VERSIONINFO_RESOURCE := $(ROOT_SRCDIR)/common/AccessBridgeStatusWindow.rc, \ |
57 VERSIONINFO_RESOURCE := $(ROOT_SRCDIR)/common/AccessBridgeStatusWindow.rc, \ |
59 RC_FLAGS := $(RC_FLAGS) \ |
|
60 -D "JDK_FNAME=javaaccessbridge$1.dll" \ |
|
61 -D "JDK_INTERNAL_NAME=javaaccessbridge$1" \ |
|
62 -D "JDK_FTYPE=0x02L", \ |
|
63 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjavaaccessbridge$1, \ |
|
64 ) |
58 ) |
65 |
59 |
66 $$(BUILD_JAVAACCESSBRIDGE$1): $(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib |
60 $$(BUILD_JAVAACCESSBRIDGE$1): $(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib |
67 |
61 |
68 TARGETS += $$(BUILD_JAVAACCESSBRIDGE$1) |
62 TARGETS += $$(BUILD_JAVAACCESSBRIDGE$1) |
69 endef |
63 endef |
70 |
64 |
71 define SetupWinDLL |
65 define SetupWinDLL |
72 # Parameter 1 Suffix |
66 # Parameter 1 Suffix |
73 # Parameter 2 ACCESSBRIDGE_ARCH_ suffix |
67 # Parameter 2 ACCESSBRIDGE_ARCH_ suffix |
74 $(call SetupNativeCompilation, BUILD_WINDOWSACCESSBRIDGE$1, \ |
68 $(call SetupJdkLibrary, BUILD_WINDOWSACCESSBRIDGE$1, \ |
75 NAME := windowsaccessbridge$1, \ |
69 NAME := windowsaccessbridge$1, \ |
76 OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
|
77 SRC := $(WIN_AB_SRCDIR), \ |
70 SRC := $(WIN_AB_SRCDIR), \ |
78 OPTIMIZATION := LOW, \ |
71 OPTIMIZATION := LOW, \ |
79 CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT $(ACCESSBRIDGE_CFLAGS) \ |
72 CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT $(ACCESSBRIDGE_CFLAGS) \ |
80 $(addprefix -I,$(WIN_AB_SRCDIR)) \ |
73 $(addprefix -I,$(WIN_AB_SRCDIR)) \ |
81 -I$(ROOT_SRCDIR)/include/bridge \ |
74 -I$(ROOT_SRCDIR)/include/bridge \ |
84 -def:$(ROOT_SRCDIR)/libwindowsaccessbridge/WinAccessBridge.DEF, \ |
77 -def:$(ROOT_SRCDIR)/libwindowsaccessbridge/WinAccessBridge.DEF, \ |
85 LIBS := kernel32.lib user32.lib gdi32.lib \ |
78 LIBS := kernel32.lib user32.lib gdi32.lib \ |
86 winspool.lib comdlg32.lib advapi32.lib shell32.lib \ |
79 winspool.lib comdlg32.lib advapi32.lib shell32.lib \ |
87 ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib, \ |
80 ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib, \ |
88 VERSIONINFO_RESOURCE := $(ROOT_SRCDIR)/common/AccessBridgeStatusWindow.rc, \ |
81 VERSIONINFO_RESOURCE := $(ROOT_SRCDIR)/common/AccessBridgeStatusWindow.rc, \ |
89 RC_FLAGS := $(RC_FLAGS) \ |
|
90 -D "JDK_FNAME=windowsaccessbridge$1.dll" \ |
|
91 -D "JDK_INTERNAL_NAME=windowsaccessbridge$1" \ |
|
92 -D "JDK_FTYPE=0x02L", \ |
|
93 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libwindowsaccessbridge$1, \ |
|
94 ) |
82 ) |
95 |
83 |
96 TARGETS += $$(BUILD_WINDOWSACCESSBRIDGE$1) |
84 TARGETS += $$(BUILD_WINDOWSACCESSBRIDGE$1) |
97 |
85 |
98 endef |
86 endef |
99 |
87 |
100 define SetupAccessBridgeSysInfo |
88 define SetupAccessBridgeSysInfo |
101 |
89 |
102 $(call SetupNativeCompilation, BUILD_ACCESSBRIDGESYSINFO, \ |
90 $(call SetupJdkLibrary, BUILD_ACCESSBRIDGESYSINFO, \ |
103 NAME := jabsysinfo, \ |
91 NAME := jabsysinfo, \ |
104 OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
|
105 SRC := $(SYSINFO_SRCDIR), \ |
92 SRC := $(SYSINFO_SRCDIR), \ |
106 OPTIMIZATION := LOW, \ |
93 OPTIMIZATION := LOW, \ |
107 CFLAGS := $(CFLAGS_JDKLIB) $(ACCESSBRIDGE_CFLAGS), \ |
94 CFLAGS := $(CFLAGS_JDKLIB) $(ACCESSBRIDGE_CFLAGS), \ |
108 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
95 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
109 -subsystem:windows -machine:I386, \ |
96 -subsystem:windows -machine:I386, \ |
110 VERSIONINFO_RESOURCE := $(ROOT_SRCDIR)/common/AccessBridgeStatusWindow.rc, \ |
97 VERSIONINFO_RESOURCE := $(ROOT_SRCDIR)/common/AccessBridgeStatusWindow.rc, \ |
111 RC_FLAGS := $(RC_FLAGS) \ |
|
112 -D "JDK_FNAME=jabsysinfo.dll" \ |
|
113 -D "JDK_INTERNAL_NAME=jabsysinfo" \ |
|
114 -D "JDK_FTYPE=0x02L", \ |
|
115 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/lib/libjabsysinfo, \ |
|
116 ) |
98 ) |
117 |
99 |
118 TARGETS += $$(BUILD_ACCESSBRIDGESYSINFO) |
100 TARGETS += $$(BUILD_ACCESSBRIDGESYSINFO) |
119 |
101 |
120 endef |
102 endef |