jdk/make/sun/awt/mawt.gmk
changeset 17673 33e311ad099a
parent 14342 8435a30053c1
equal deleted inserted replaced
17672:d1c8ac4c7a7b 17673:33e311ad099a
    40 
    40 
    41 # Check which C files should be built.  Headless uses only
    41 # Check which C files should be built.  Headless uses only
    42 # non-motif files.  Also, a version-specific motif file is
    42 # non-motif files.  Also, a version-specific motif file is
    43 # compiled based on the motif version.
    43 # compiled based on the motif version.
    44 FILES_c = $(FILES_NO_MOTIF_c)
    44 FILES_c = $(FILES_NO_MOTIF_c)
       
    45 
       
    46 ifeq ($(PLATFORM), macosx)
       
    47 FILES_objc = $(FILES_NO_MOTIF_objc)
       
    48 endif # PLATFORM
    45 
    49 
    46 ifeq ($(PLATFORM), solaris)
    50 ifeq ($(PLATFORM), solaris)
    47   ifneq ($(ARCH), amd64)
    51   ifneq ($(ARCH), amd64)
    48     FILES_reorder += reorder-$(ARCH)
    52     FILES_reorder += reorder-$(ARCH)
    49   endif
    53   endif
    94 vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/../java2d
    98 vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/../java2d
    95 vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/../java2d/loops
    99 vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/../java2d/loops
    96 vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/../java2d/pipe
   100 vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/../java2d/pipe
    97 vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR)/image
   101 vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR)/image
    98 vpath %.c   $(PLATFORM_SRC)/native/$(PKGDIR)/robot_child
   102 vpath %.c   $(PLATFORM_SRC)/native/$(PKGDIR)/robot_child
       
   103 
       
   104 ifeq ($(PLATFORM), macosx)
       
   105 vpath %.m   $(call NativeSrcDirList,,native/sun/font)
       
   106 endif # PLATFORM
    99 
   107 
   100 #
   108 #
   101 # Libraries to link in.
   109 # Libraries to link in.
   102 #
   110 #
   103 
   111 
   190             -I$(PLATFORM_SRC)/native/$(PKGDIR)/../jdga \
   198             -I$(PLATFORM_SRC)/native/$(PKGDIR)/../jdga \
   191         -I$(PLATFORM_SRC)/native/$(PKGDIR) \
   199         -I$(PLATFORM_SRC)/native/$(PKGDIR) \
   192         $(EVENT_MODEL)
   200         $(EVENT_MODEL)
   193 
   201 
   194 ifeq ($(PLATFORM), macosx)
   202 ifeq ($(PLATFORM), macosx)
   195 CPPFLAGS += -I$(CUPS_HEADERS_PATH)
   203 CPPFLAGS += -I$(CUPS_HEADERS_PATH) \
       
   204 			$(call NativeSrcDirList,-I,native/sun/awt) \
       
   205 			$(call NativeSrcDirList,-I,native/sun/font)
   196 
   206 
   197 ifndef HEADLESS
   207 ifndef HEADLESS
   198 CPPFLAGS += -I$(MOTIF_DIR)/include \
   208 CPPFLAGS += -I$(MOTIF_DIR)/include \
   199             -I$(OPENWIN_HOME)/include 
   209             -I$(OPENWIN_HOME)/include 
   200 LDFLAGS  += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
   210 LDFLAGS  += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
   201 
   211 else
       
   212 LDFLAGS  += -framework Accelerate \
       
   213 			-framework ApplicationServices \
       
   214 			-framework Cocoa \
       
   215 			-F/System/Library/Frameworks/JavaVM.framework/Frameworks \
       
   216 			-framework JavaNativeFoundation \
       
   217 			-framework JavaRuntimeSupport
   202 endif # !HEADLESS
   218 endif # !HEADLESS
   203 endif # PLATFORM
   219 endif # PLATFORM
   204 
   220 
   205 ifeq ($(PLATFORM), linux)
   221 ifeq ($(PLATFORM), linux)
   206   # Checking for the X11/extensions headers at the additional location
   222   # Checking for the X11/extensions headers at the additional location