Changeset 208 for trunk/openjdk/jdk/make/sun

Timestamp:

Dec 10, 2010, 5:58:20 PM (15 years ago)

Author:

dmik

Message:

jdk: Made build splashscreen.dll, jpeg.dll, lcms.dll.

Location:

trunk/openjdk/jdk/make/sun

Files:

• cmm/kcms/Makefile (modified) (3 diffs)
• cmm/lcms/Makefile (modified) (2 diffs)
• splashscreen/Makefile (modified) (2 diffs)

trunk/openjdk/jdk/make/sun/cmm/kcms/Makefile

@@ -85 +85 @@
 vpath %.c   $(CLOSED_SRC)/share/native/$(PKGDIR)
 
-ifeq ($(filter-out windows os2, $(PLATFORM)),)
+ifeq ($(PLATFORM), windows)
 
 OTHER_LDLIBS = user32.lib version.lib
@@ -97 +97 @@
 
 else # PLATFORM
+ifeq ($(PLATFORM), os2)
+
+OTHER_LDLIBS = -luser32.lib -lversion.lib
+
+else # PLATFORM
 OTHER_LDLIBS = $(LIBM)
 
@@ -105 +110 @@
 
 endif # PLATFORM
+endif # PLATFORM
 
 #CFLAGS += -DJAVACMM -DFUT_CALC_EX -DNO_FUT_GCONST

trunk/openjdk/jdk/make/sun/cmm/lcms/Makefile

@@ -34 +34 @@
 # Files
 #
-ifeq ($(PLATFORM), windows)
+ifeq ($(filter-out windows os2,$(PLATFORM)),)
 include FILES_c_windows.gmk
 else # PLATFORM
@@ -93 +93 @@
 
 else
+ifeq ($(PLATFORM), os2)
+
+OTHER_LDLIBS = -luser32.lib -lversion.lib -l$(OBJDIR)/../../../sun.awt/awt/$(OBJDIRNAME)/awt.lib
+OTHER_INCLUDES += -I$(SHARE_SRC)/native/sun/java2d \
+                  -I$(SHARE_SRC)/native/sun/awt/debug
+
+else
 OTHER_LDLIBS = $(LIBM) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt 
 CPPFLAGS += -I$(SHARE_SRC)/native/sun/java2d \
             -I$(SHARE_SRC)/native/sun/awt/debug
 endif
-
+endif

trunk/openjdk/jdk/make/sun/splashscreen/Makefile

@@ -29 +29 @@
 PRODUCT = sun
 include $(BUILDDIR)/common/Defs.gmk
+
+LIBRARY_SHORT = splshscr
 
 #
@@ -67 +69 @@
   OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
 else # PLATFORM
+ifeq ($(PLATFORM), windows)
   CFLAGS += -DWITH_WIN32
   OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib 
 #$(JVMLIB) $(OBJDIR)/../../jpeg/$(OBJDIRNAME)/jpeg$(SUFFIX).lib
+else # PLATFORM = os2
+  CFLAGS += -DWITH_WIN32
+  OTHER_LDLIBS += -lkernel32.lib -luser32.lib -lgdi32.lib 
+endif # PLATFORM
 endif # PLATFORM