Print this page


Split Close
Expand all
Collapse all
          --- old/make/sun/font/Makefile
          +++ new/make/sun/font/Makefile
↓ open down ↓ 167 lines elided ↑ open up ↑
 168  168  vpath %.cpp   $(PLATFORM_SRC)/native/sun/windows
 169  169  else # PLATFORM
 170  170  
 171  171  #
 172  172  # Libraries to link, and other C flags.
 173  173  #
 174  174  
 175  175  ifeq ($(PLATFORM), solaris)
 176  176    # Note that on Solaris, fontmanager is built against the headless library.
 177  177    LDFLAGS      += -L$(LIBDIR)/$(LIBARCH)/headless
 178      -  OTHER_LDLIBS += -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt -lc $(LIBM) $(LIBCXX)
      178 +  OTHER_LDLIBS += -lawt -lawt_xawt -lc $(LIBM) $(LIBCXX)
 179  179  else # PLATFORM is linux
 180  180   OTHER_LDLIBS  += -lawt $(LIBM) $(LIBCXX)
 181  181    ifeq ("$(CC_VER_MAJOR)", "3")
 182  182      OTHER_LDLIBS  += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
 183  183    endif                           
 184  184  endif
 185  185  
 186  186  endif # PLATFORM
 187  187  
 188  188  # set up compile flags..
↓ open down ↓ 20 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX