Changeset 55 for trunk

Timestamp:

Jul 14, 2010, 7:01:17 PM (15 years ago)

Author:

dmik

Message:

hotspot/make/os2: Disable BSD stuff at compile time and add necessary Odin32 libraries to the link command.

Location:

trunk/openjdk

Files:

• hotspot/make/os2/makefiles/compile.make (modified) (2 diffs)
• jdk/make/common/Defs-os2.gmk (modified) (1 diff)

trunk/openjdk/hotspot/make/os2/makefiles/compile.make

@@ -53 +53 @@
 LINK = g++
 LINK_FLAGS = \
- -Zomf -Zmap -Zstack 0x2000 -Zlinker "DISABLE 1121" -Zhigh-mem \
-
- # @todo
- #kernel32.lib user32.lib gdi32.lib winspool.lib \
- #comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \
- #uuid.lib Wsock32.lib winmm.lib
+ -Zomf -Zmap -Zstack 0x2000 -Zlinker "DISABLE 1121" -Zhigh-mem
 
 IMPLIB = emximp
@@ -64 +59 @@
 # Odin SDK
 
-CPP_FLAGS += -D__WIN32OS2__ -D__i386__ -DSTRICT
+CPP_FLAGS += -D__WIN32OS2__ -D__i386__ -DSTRICT -D_POSIX_SOURCE \
+             -D_POSIX_C_SOURCE=200112 -D_EMX_SOURCE -D_XOPEN_SOURCE=600 \
+                 -D_SVID_SOURCE
 CPP_FLAGS += -I$(ALT_ODINSDK_PATH)/include/Win -I$(ALT_ODINSDK_PATH)/include
 
 LINK_FLAGS  += -L$(ALT_ODINSDK_PATH)/lib -L$(ALT_ODINSDK_PATH)/lib/Release \
-                           -lkernel32.lib -luser32.lib
+                           -lkernel32.lib -luser32.lib -lgdi32.lib -lwinspool.lib \
+               -lcomdlg32.lib -ladvapi32.lib -lshell32.lib -lole32.lib \
+               -loleaut32.lib -lWsock32.lib -lwinmm.lib

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

@@ -149 +149 @@
 #
 
-CPPFLAGS_COMMON += -D__WIN32OS2__ -D__i386__ -D_POSIX_SOURCE -DSTRICT \
+CPPFLAGS_COMMON += -D__WIN32OS2__ -D__i386__ -DSTRICT -D_POSIX_SOURCE \
                    -D_POSIX_C_SOURCE=200112 -D_EMX_SOURCE -D_XOPEN_SOURCE=600 \
                                    -D_SVID_SOURCE