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

Timestamp:

Jun 17, 2010, 4:08:35 PM (15 years ago)

Author:

dmik

Message:

jdk/make: Integrate Odin SDK to the compiler/linker definitions and require a valid path to it to be set.

File:

• trunk/openjdk/jdk/make/common/Defs-os2.gmk (modified) (3 diffs)

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

@@ -44 +44 @@
 
 ifndef PLATFORM_SRC
-  PLATFORM_SRC  = $(BUILDDIR)/../src/os2
+  # We mostly reuse the windows code so far.
+  PLATFORM_SRC  = $(BUILDDIR)/../src/windows
 endif # PLATFORM_SRC
 
@@ -75 +76 @@
 # level.
 #
-HPIS = os2
+HPIS = windows
 
 #
@@ -134 +135 @@
 # Linker options
 #
-LDFLAGS_COMMON  = -Zomf -Zstack 0x2000 -Zlinker "DISABLE 1121" -Zhigh-mem
+LDFLAGS_COMMON  = -Zomf -Zmap -Zstack 0x2000 -Zlinker "DISABLE 1121" -Zhigh-mem
 LDFLAGS_OPT     = -s
 LDFLAGS_DBG     =
+
+#
+# Additional libraries needed by all targets
+#
+
+CPPFLAGS_COMMON += -D__WIN32OS2__ -D__i386__
+CPPFLAGS_COMMON += -I$(ODINSDK_PATH)/include/Win -I$(ODINSDK_PATH)/include
+LDFLAGS_COMMON  += -L$(ODINSDK_PATH)/lib -L$(ODINSDK_PATH)/lib/Release
+EXTRA_LIBS      +=
 
 #