Changeset 85

Timestamp:

Jul 30, 2010, 2:26:09 PM (15 years ago)

Author:

dmik

Message:

jdk/make: Add missing libraries.

Location:

trunk/openjdk/jdk/make

Files:

• common/Defs-os2.gmk (modified) (1 diff)
• java/java/Makefile (modified) (1 diff)

trunk/openjdk/jdk/make/common/Defs-os2.gmk

@@ -152 +152 @@
                    -D_POSIX_C_SOURCE=200112 -D_EMX_SOURCE -D_XOPEN_SOURCE=600 \
                                    -D_SVID_SOURCE
-CPPFLAGS_COMMON += -I$(ODINSDK_PATH)/include/Win -I$(ODINSDK_PATH)/include
+CPPFLAGS_COMMON += -I$(ODINSDK_PATH)/include/Win -I$(ODINSDK_PATH)/include \
+                   -DWINE_LARGE_INTEGER
 LDFLAGS_COMMON  += -L$(ODINSDK_PATH)/lib -L$(ODINSDK_PATH)/lib/Release \
-                                   -lkernel32.lib -luser32.lib
+                                   -lkernel32.lib -luser32.lib -ladvapi32.lib \
+                                   -lminivcrt.lib -lntdll.lib
 
 #

trunk/openjdk/jdk/make/java/java/Makefile

@@ -226 +226 @@
 else
 ifeq ($(PLATFORM),os2)
-OTHER_LDLIBS += $(JVMLIB) -L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlibm.lib \
-                       -L$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib
+OTHER_LDLIBS += $(JVMLIB) -L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.lib \
+                       -L$(OBJDIR)/../../../verify/$(OBJDIRNAME) -lverify.lib
 else
 OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -lnsl -ldl \