Changeset 310 for trunk/openjdk/corba

Timestamp:

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

Author:

dmik

Message:

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

Location:

trunk/openjdk/corba/make/common

Files:

• Defs-os2.gmk (modified) (1 diff)
• shared/Defs-os2.gmk (modified) (1 diff)

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

@@ -164 +164 @@
                    -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
 
 #

trunk/openjdk/corba/make/common/shared/Defs-os2.gmk

@@ -142 +142 @@
 endif
 
-# ODINSDK_PATH: Path to the root directory of Odin32 SDK
-ifdef ALT_ODINSDK_PATH
-  xALT_ODINSDK_PATH :="$(subst \,/,$(ALT_ODINSDK_PATH))"
-  ODINSDK_PATH      :=$(call FullPath,$(xALT_ODINSDK_PATH))
+# ODINSDK_HEADERS_PATH: Include directory of Odin32 SDK (OS/2)
+ifdef ALT_ODINSDK_HEADERS_PATH
+  xALT_ODINSDK_HEADERS_PATH :="$(subst \,/,$(ALT_ODINSDK_HEADERS_PATH))"
+  ODINSDK_HEADERS_PATH      :=$(call FullPath,$(xALT_ODINSDK_HEADERS_PATH))
 endif
-ODINSDK_PATH :=$(call AltCheckSpaces,ODINSDK_PATH)
-ODINSDK_PATH :=$(call AltCheckValue,ODINSDK_PATH)
+ODINSDK_HEADERS_PATH :=$(call AltCheckSpaces,ODINSDK_HEADERS_PATH)
+ODINSDK_HEADERS_PATH :=$(call AltCheckValue,ODINSDK_HEADERS_PATH)
+
+# ODINSDK_LIB_PATH: Library directory of Odin32 SDK (OS/2)
+ifdef ALT_ODINSDK_LIB_PATH
+  xALT_ODINSDK_LIB_PATH :="$(subst \,/,$(ALT_ODINSDK_LIB_PATH))"
+  ODINSDK_LIB_PATH      :=$(call FullPath,$(xALT_ODINSDK_LIB_PATH))
+endif
+ODINSDK_LIB_PATH :=$(call AltCheckSpaces,ODINSDK_LIB_PATH)
+ODINSDK_LIB_PATH :=$(call AltCheckValue,ODINSDK_LIB_PATH)
+
+# ODINSDK_DBGLIB_PATH: Debug Library directory of Odin32 SDK (OS/2)
+ifdef ALT_ODINSDK_DBGLIB_PATH
+  xALT_ODINSDK_DBGLIB_PATH :="$(subst \,/,$(ALT_ODINSDK_DBGLIB_PATH))"
+  ODINSDK_DBGLIB_PATH      :=$(call FullPath,$(xALT_ODINSDK_DBGLIB_PATH))
+endif
+ODINSDK_DBGLIB_PATH :=$(call AltCheckSpaces,ODINSDK_DBGLIB_PATH)
+ODINSDK_DBGLIB_PATH :=$(call AltCheckValue,ODINSDK_DBGLIB_PATH)
 
 # Import JDK images allow for partial builds, components not built are