Changeset 233

Timestamp:

Jan 10, 2011, 1:55:03 PM (15 years ago)

Author:

dmik

Message:

make: Enabled building of jawt.lib.

Location:

trunk/openjdk/jdk/make/sun

Files:

• Makefile (modified) (1 diff)
• jawt/Makefile (modified) (5 diffs)

trunk/openjdk/jdk/make/sun/Makefile

@@ -74 +74 @@
           $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \
           font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \
-          text nio launcher management $(ORG_SUBDIR) \
+          jawt text nio launcher management $(ORG_SUBDIR) \
           native2ascii serialver tools jconsole
 endif

trunk/openjdk/jdk/make/sun/jawt/Makefile

@@ -50 +50 @@
 
 
-ifeq ($(filter-out windows os2, $(PLATFORM)),)
+ifeq ($(PLATFORM), windows)
 #
 # Extra C flags.
@@ -83 +83 @@
 #
 ifeq ($(ARCH_DATA_MODEL), 64)
-OTHER_LDLIBS = $(OBJDIR)/../../awt/$(OBJDIRNAME)/awt.lib 
+OTHER_LDLIBS = $(OBJDIR)/../../awt/$(OBJDIRNAME)/awt.lib
 else
 OTHER_LDLIBS = /nod:kernel32.lib /nod:advapi32.lib /nod:user32.lib \
@@ -92 +92 @@
                /nod:sensapi.lib \
                $(UNICOWS_LIB_PATH)/unicows.lib kernel32.lib \
-               $(OBJDIR)/../../awt/$(OBJDIRNAME)/awt.lib 
+               $(OBJDIR)/../../awt/$(OBJDIRNAME)/awt.lib
 endif
+else
+ifeq ($(PLATFORM), os2)
+
+OTHER_CXXFLAGS += -DUNICODE -D_UNICODE
+
+#
+# Other extra flags needed for compiling.
+#
+CPPFLAGS += -I$(SHARE_SRC)/native/common \
+        -I$(PLATFORM_SRC)/native/sun/windows \
+        -I$(CLASSHDRDIR:%/jawt/CClassHeaders=%/awt/CClassHeaders) \
+        -I$(SHARE_SRC)/native/sun/awt/debug \
+        -I$(SHARE_SRC)/native/sun/font \
+        -I$(SHARE_SRC)/native/sun/java2d \
+        -I$(SHARE_SRC)/native/sun/java2d/loops \
+        -I$(SHARE_SRC)/native/sun/java2d/pipe \
+        -I$(PLATFORM_SRC)/native/sun/java2d \
+        -I$(PLATFORM_SRC)/native/sun/java2d/windows \
+        -I$(PLATFORM_SRC)/native/sun/java2d/d3d \
+        -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \
+        -I$(SHARE_SRC)/javavm/export \
+        -I$(PLATFORM_SRC)/javavm/export
+INSTALL_DOT_LIB = true
+
+vpath %.cpp   $(PLATFORM_SRC)/native/sun/windows
+
+OTHER_LDLIBS = -lkernel32.lib -ladvapi32.lib -luser32.lib \
+               -lgdi32.lib -lshell32.lib -lcomdlg32.lib \
+               -lversion.lib -lmpr.lib -lrasapi32.lib \
+               -lwinmm.lib -lwinspool.lib \
+               -lsecur32.lib -loleacc.lib -loledlg.lib \
+               -l$(OBJDIR)/../../awt/$(OBJDIRNAME)/awt.lib
 else # PLATFORM
 
@@ -128 +160 @@
 
 endif # PLATFORM
+endif # PLATFORM
 
 
@@ -142 +175 @@
 build: $(FILES_h)
 
-ifeq ($(filter-out windows os2, $(PLATFORM)),)
+ifeq ($(PLATFORM), windows)
 include make.depend
 endif