Changeset 15 for trunk


Ignore:
Timestamp:
Jun 9, 2010, 1:50:49 AM (15 years ago)
Author:
dmik
Message:

os2: Added prebuilt Freetype 2.3.11 library from ​http://svn.netlabs.org/lucide/browser/trunk/poppler/freetype2?rev=367.

Location:
trunk
Files:
93 added
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk/jdk/make/common/Defs.gmk

    r2 r15  
    135135#   ALT_BINARY_PLUGS_JARFILE is probably rarely needed. It can be used
    136136#   to identify the exact jar file to be used for all closed classes..
    137 # 
     137#
    138138#   ALT_BINARY_PLUGS_PATH points to a directory containing precisely the
    139 #   binaries needed to build. 
    140 # 
    141 #   ALT_BUILD_BINARY_PLUGS_PATH points to a directory containing binary plug dirs 
     139#   binaries needed to build.
     140#
     141#   ALT_BUILD_BINARY_PLUGS_PATH points to a directory containing binary plug dirs
    142142#   multiple architectures named using the standard conventions
    143143#   This is useful for build scripts that need to build multiple architectures
    144144#   of the OpenJDK.
    145 #   
     145#
    146146#   ALT_CLOSED_JDK_IMPORT_PATH points to the top-level of a specific platform
    147147#   JDK image.
    148 # 
     148#
    149149#   The precedence is that
    150150#     1. ALT_BINARY_PLUGS_JARFILE overrides any other location of the classes
    … …  
    210210endif
    211211ifeq ($(PLATFORM), solaris)
    212   # historically for Solaris we have slightly different devtools 
     212  # historically for Solaris we have slightly different devtools
    213213  # naming conventions
    214214  DEVTOOLS_FT_DIR=$(JDK_DEVTOOLS_DIR)/$(ARCH_FAMILY)/freetype-$(ARCH)
    … …  
    231231      USING_SYSTEM_FT_LIB=true
    232232    endif
    233   endif 
    234 
    235   ifeq ($(PLATFORM), windows)
     233  endif
     234
     235  ifeq ($(filter-out windows os2,$(PLATFORM)),)
    236236    FREETYPE_LIB = $(FREETYPE_LIB_PATH)/freetype.lib
    237237  else
    … …  
    336336DOCSDIRSUFFIX       =
    337337
    338 # The MESSAGE, WARNING and ERROR files are used to store sanityck and 
    339 # SCCS check messages, warnings and errors. 
     338# The MESSAGE, WARNING and ERROR files are used to store sanityck and
     339# SCCS check messages, warnings and errors.
    340340ifndef ERROR_FILE
    341341  ERROR_FILE   = $(OUTPUTDIR)/sanityCheckErrors.txt
    … …  
    356356# An attempt is made to generate unique enough directories for the
    357357# generated files to not have name collisisons. Most build units
    358 # defines PRODUCT (except Release.gmk), but then they may or may 
    359 # not define PACKAGE, THREADIR (only HPI uses this), PROGRAM, and 
    360 # LIBRARY. This code chunk attempts to generate a unique 
    361 # OBJDIR/CLASSHDRDIR for each build unit based on which of those 
     358# defines PRODUCT (except Release.gmk), but then they may or may
     359# not define PACKAGE, THREADIR (only HPI uses this), PROGRAM, and
     360# LIBRARY. This code chunk attempts to generate a unique
     361# OBJDIR/CLASSHDRDIR for each build unit based on which of those
    362362# values are set within each build unit.
    363363
    … …  
    388388endif
    389389
    390 # the use of += above makes a space separated list which we need to 
     390# the use of += above makes a space separated list which we need to
    391391# remove for filespecs.
    392392#
    … …  
    406406
    407407# OBJDIRNAME is the name of the directory where the object code is to
    408 #   be placed. It's name depends on whether the data model architecture 
     408#   be placed. It's name depends on whether the data model architecture
    409409#   is 32-bit or not.
    410410ifneq ($(ARCH_DATA_MODEL), 32)
    … …  
    461461
    462462#
    463 # VPATH.h is used elsewhere to generate include flags.  By default, 
     463# VPATH.h is used elsewhere to generate include flags.  By default,
    464464# anyone has access to the include files that the JVM area exports,
    465465# namely jni.h, jvm.h, and jni_utils.h, plus their platform-specific
    … …  
    674674VERSION_DEFINES = -DRELEASE='"$(RELEASE)"'
    675675
    676 # Note: As a rule, GNU Make rules should not appear in any of the 
     676# Note: As a rule, GNU Make rules should not appear in any of the
    677677# Defs*.gmk files. These were added for Kestrel-Solaris and do address
    678678# a TeamWare bug. They should be moved elsewhere for Merlin.
    679 # 
     679#
    680680#  Override gnumake built-in rules which do sccs get operations badly.
    681681#  (They put the checked out code in the current directory, not in the
    682 #  directory of the original file.) 
     682#  directory of the original file.)
    683683# Since this is a symptom of a teamware failure, complain and die on the spot.
    684684

  • trunk/openjdk/jdk/make/tools/freetypecheck/Makefile

    r13 r15  
    5454  DFLAG=/D
    5555else
     56ifeq ($(PLATFORM), os2)
     57  FT_OPTIONS += $(LDFLAGS)
     58  DFLAG = -D
     59else
    5660  FT_OPTIONS += -L$(FT_LIB)
    5761  DFLAG = -D
    … …  
    6367      FT_OPTIONS += -Wl,-rpath -Wl,$(FT_LIB)
    6468  endif
     69endif
    6570endif
    6671
Note: See TracChangeset for help on using the changeset viewer.