Changeset 74 for trunk/openjdk/jdk/make/sun/font

Timestamp:

Jul 21, 2010, 9:16:25 PM (15 years ago)

Author:

dmik

Message:

jdk/make: Adopted a huge bunch of makefiles to OS/2 (will be tested as they get used).

Location:

trunk/openjdk/jdk/make/sun/font

Files:

• FILES_c.gmk (modified) (1 diff)
• Makefile (modified) (4 diffs)
• t2k/Makefile (modified) (2 diffs)

trunk/openjdk/jdk/make/sun/font/FILES_c.gmk

@@ -113 +113 @@
 
 
-ifeq ($(PLATFORM),windows)
+ifeq ($(filter-out windows os2,$(PLATFORM)),)
 FILES_c_platform = fontpath.c
 FILES_cpp_platform = D3DTextRenderer.cpp

trunk/openjdk/jdk/make/sun/font/Makefile

@@ -75 +75 @@
     sun/java2d/loops/GraphicsPrimitive.java
 
-ifeq ($(PLATFORM), windows)
+ifeq ($(filter-out windows os2, $(PLATFORM)),)
 
   # Files built here do not compile with warning level 3 if warnings are fatal
@@ -131 +131 @@
 
 $(LIB_LOCATION)/$(LIB_PREFIX)freetype.$(LIBRARY_SUFFIX):
-ifeq ($(PLATFORM), windows)
+ifeq ($(filter-out windows os2, $(PLATFORM)),)
         $(CP) $(FREETYPE_LIB_PATH)/$(LIB_PREFIX)freetype.$(LIBRARY_SUFFIX) $@
 else 
@@ -169 +169 @@
 endif
 
-ifeq ($(PLATFORM), windows)
+ifeq ($(filter-out windows os2, $(PLATFORM)),)
 vpath %.cpp   $(PLATFORM_SRC)/native/sun/windows
 vpath %.cpp   $(PLATFORM_SRC)/native/sun/java2d/d3d
@@ -205 +205 @@
             -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders
 
-ifeq ($(PLATFORM), windows)
+ifeq ($(filter-out windows os2, $(PLATFORM)),)
 CPPFLAGS += -I$(PLATFORM_SRC)/native/sun/windows \
             -I$(PLATFORM_SRC)/native/sun/java2d/d3d

trunk/openjdk/jdk/make/sun/font/t2k/Makefile

@@ -63 +63 @@
     sun/font/T2KFontScaler.java 
 
-ifeq ($(PLATFORM), windows)
+ifeq ($(filter-out windows os2, $(PLATFORM)),)
 
   # Files built here do not compile with warning level 3 if warnings are fatal
@@ -99 +99 @@
 #
 # setup the list of libraries to link in...
-ifneq ($(PLATFORM), windows)
+ifneq ($(filter-out windows os2, $(PLATFORM)),)
   OTHER_LDLIBS  +=  $(LIBM) $(LIBCXX) -lfontmanager
   ifeq ($(PLATFORM), linux)