equal
deleted
inserted
replaced
38 PRODUCT = java |
38 PRODUCT = java |
39 include $(BUILDDIR)/common/Defs.gmk |
39 include $(BUILDDIR)/common/Defs.gmk |
40 |
40 |
41 SERVER_LOCATION = server |
41 SERVER_LOCATION = server |
42 CLIENT_LOCATION = client |
42 CLIENT_LOCATION = client |
43 KERNEL_LOCATION = kernel |
|
44 |
43 |
45 DB_SUFFIX = _db |
44 DB_SUFFIX = _db |
46 |
45 |
47 ifeq ($(PLATFORM), windows) |
46 ifeq ($(PLATFORM), windows) |
48 LIB_LOCATION = $(BINDIR) |
47 LIB_LOCATION = $(BINDIR) |
102 endif |
101 endif |
103 |
102 |
104 ifeq ($(PLATFORM), windows) |
103 ifeq ($(PLATFORM), windows) |
105 # Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv Windows |
104 # Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv Windows |
106 |
105 |
107 # Add the Java Kernel VM to the import path, but only on windows 32-bit Windows |
|
108 ifeq ($(ARCH_DATA_MODEL), 32) |
|
109 ifeq ($(DO_KERNEL), true) |
|
110 IMPORT_LIST += $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVM_NAME) \ |
|
111 $(LIB_LOCATION)/$(KERNEL_LOCATION)/Xusage.txt |
|
112 endif |
|
113 endif |
|
114 |
|
115 IMPORT_LIST += $(MS_RUNTIME_LIBRARIES:%=$(BINDIR)/%) |
106 IMPORT_LIST += $(MS_RUNTIME_LIBRARIES:%=$(BINDIR)/%) |
116 |
107 |
117 # NOTE: These might actually come from BUILDDIR, depends on the settings. |
108 # NOTE: These might actually come from BUILDDIR, depends on the settings. |
118 $(BINDIR)/msvcrt.dll: $(MSVCRT_DLL_PATH)/msvcrt.dll |
109 $(BINDIR)/msvcrt.dll: $(MSVCRT_DLL_PATH)/msvcrt.dll |
119 $(install-import-file) |
110 $(install-import-file) |