Changeset 310 for trunk/openjdk/jdk/make/common/Defs-os2.gmk

Timestamp:

Feb 14, 2012, 9:22:16 PM (14 years ago)

Author:

dmik

Message:

Tailor makefiles for the new Odin 8.x build layout.

File:

• trunk/openjdk/jdk/make/common/Defs-os2.gmk (modified) (1 diff)

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

@@ -174 +174 @@
                    -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_HEADERS_PATH)/Win -I$(ODINSDK_HEADERS_PATH) \
                    -DWINE_LARGE_INTEGER
 
-LDFLAGS_OPT     += -L$(ODINSDK_PATH)/lib/Release -L$(ODINSDK_PATH)/lib
-LDFLAGS_DBG     += -L$(ODINSDK_PATH)/lib/Debug -L$(ODINSDK_PATH)/lib
+LDFLAGS_OPT     += -L$(ODINSDK_LIB_PATH)
+LDFLAGS_DBG     += -L$(firstword $(ODINSDK_DBGLIB_PATH) $(ODINSDK_LIB_PATH))
 LDFLAGS_COMMON  += -lkernel32.lib -luser32.lib -ladvapi32.lib \
-                                   -lminivcrt.lib -lntdll.lib \
-                                   -llibwrap0.lib -llibwrap1.lib
+                                   -lminivcrt.lib -lntdll.lib -llibwrap.lib
 
 #