jdk/makefiles/CompileNativeLibraries.gmk
changeset 17673 33e311ad099a
parent 17448 c93083bb7f29
child 17735 cfde9878a8c2
equal deleted inserted replaced
17672:d1c8ac4c7a7b 17673:33e311ad099a
  2312 			$(JDK_TOPDIR)/src/solaris/native/sun/font \
  2312 			$(JDK_TOPDIR)/src/solaris/native/sun/font \
  2313 			$(JDK_TOPDIR)/src/solaris/native/sun/awt \
  2313 			$(JDK_TOPDIR)/src/solaris/native/sun/awt \
  2314 			$(JDK_TOPDIR)/src/solaris/native/sun/java2d/opengl \
  2314 			$(JDK_TOPDIR)/src/solaris/native/sun/java2d/opengl \
  2315 			$(JDK_TOPDIR)/src/solaris/native/sun/java2d/x11
  2315 			$(JDK_TOPDIR)/src/solaris/native/sun/java2d/x11
  2316 
  2316 
       
  2317 ifeq ($(OPENJDK_TARGET_OS),macosx)
       
  2318 	LIBAWT_HEADLESS_DIRS+=$(JDK_TOPDIR)/src/macosx/native/sun/font
       
  2319 endif
       
  2320 
  2317 LIBAWT_HEADLESS_CFLAGS:=-DHEADLESS=true \
  2321 LIBAWT_HEADLESS_CFLAGS:=-DHEADLESS=true \
  2318                           -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
  2322                           -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
  2319 			  $(CUPS_CFLAGS) \
  2323 			  $(CUPS_CFLAGS) \
  2320 			  $(X_CFLAGS) \
  2324 			  $(X_CFLAGS) \
  2321 			  -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
  2325 			  -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
  2325 			  -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
  2329 			  -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
  2326 			  -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
  2330 			  -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
  2327 			  -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
  2331 			  -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
  2328 			  -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \
  2332 			  -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \
  2329                           $(foreach dir,$(LIBAWT_HEADLESS_DIRS),-I$(dir))
  2333                           $(foreach dir,$(LIBAWT_HEADLESS_DIRS),-I$(dir))
       
  2334 
       
  2335 ifeq ($(OPENJDK_TARGET_OS),macosx)
       
  2336 	LIBAWT_HEADLESS_CFLAGS+=\
       
  2337 		-F/System/Library/Frameworks/JavaVM.framework/Frameworks \
       
  2338 		-F/System/Library/Frameworks/ApplicationServices.framework/Frameworks
       
  2339 endif
  2330 
  2340 
  2331 LIBAWT_HEADLESS_FILES:=\
  2341 LIBAWT_HEADLESS_FILES:=\
  2332 	awt_Font.c \
  2342 	awt_Font.c \
  2333 	HeadlessToolkit.c \
  2343 	HeadlessToolkit.c \
  2334 	fontpath.c \
  2344 	fontpath.c \
  2354         GLXGraphicsConfig.c \
  2364         GLXGraphicsConfig.c \
  2355         GLXSurfaceData.c \
  2365         GLXSurfaceData.c \
  2356         AccelGlyphCache.c \
  2366         AccelGlyphCache.c \
  2357 	CUPSfuncs.c
  2367 	CUPSfuncs.c
  2358 
  2368 
       
  2369 ifeq ($(OPENJDK_TARGET_OS),macosx)
       
  2370 	LIBAWT_HEADLESS_FILES+=\
       
  2371 		AWTFont.m \
       
  2372 		AWTStrike.m \
       
  2373 		CCharToGlyphMapper.m \
       
  2374 		CGGlyphImages.m \
       
  2375 		CGGlyphOutlines.m \
       
  2376 		CoreTextSupport.m
       
  2377 endif
       
  2378 
  2359 LIBAWT_HEADLESS_REORDER:=
  2379 LIBAWT_HEADLESS_REORDER:=
  2360 ifeq ($(OPENJDK_TARGET_OS), solaris)
  2380 ifeq ($(OPENJDK_TARGET_OS), solaris)
  2361 	ifneq ($(OPENJDK_TARGET_CPU), x86_64)
  2381 	ifneq ($(OPENJDK_TARGET_CPU), x86_64)
  2362 		LIBAWT_HEADLESS_REORDER:=$(JDK_TOPDIR)/makefiles/mapfiles/libawt_headless/reorder-$(OPENJDK_TARGET_CPU)
  2382 		LIBAWT_HEADLESS_REORDER:=$(JDK_TOPDIR)/makefiles/mapfiles/libawt_headless/reorder-$(OPENJDK_TARGET_CPU)
  2363 	endif
  2383 	endif
  2380 				 -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR),\
  2400 				 -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR),\
  2381 		LDFLAGS_macosx:=$(call SET_SHARED_LIBRARY_ORIGIN).,\
  2401 		LDFLAGS_macosx:=$(call SET_SHARED_LIBRARY_ORIGIN).,\
  2382 		REORDER:=$(LIBAWT_HEADLESS_REORDER), \
  2402 		REORDER:=$(LIBAWT_HEADLESS_REORDER), \
  2383 		LDFLAGS_SUFFIX_linux:=-ljvm -lawt -lm $(LIBDL) -ljava,\
  2403 		LDFLAGS_SUFFIX_linux:=-ljvm -lawt -lm $(LIBDL) -ljava,\
  2384 		LDFLAGS_SUFFIX_solaris:=$(LIBDL) -ljvm -lawt -lm -ljava $(LIBCXX) -lc,\
  2404 		LDFLAGS_SUFFIX_solaris:=$(LIBDL) -ljvm -lawt -lm -ljava $(LIBCXX) -lc,\
  2385 		LDFLAGS_SUFFIX_macosx:=-ljvm $(LIBCXX) -lawt $(LIBDL) -ljava,\
  2405 		LDFLAGS_SUFFIX_macosx:=-ljvm $(LIBCXX) -lawt $(LIBDL) -ljava \
       
  2406 				 -framework Accelerate \
       
  2407 				 -framework ApplicationServices \
       
  2408 				 -framework Cocoa \
       
  2409 				 -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
       
  2410 				 -framework JavaNativeFoundation \
       
  2411 				 -framework JavaRuntimeSupport,\
  2386 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libawt_headless,\
  2412 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libawt_headless,\
  2387 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  2413 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  2388 
  2414 
  2389 $(BUILD_LIBAWT_HEADLESS) : $(BUILD_LIBAWT)
  2415 $(BUILD_LIBAWT_HEADLESS) : $(BUILD_LIBAWT)
  2390 
  2416