stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7152186: java.awt.HeadlessException when running AWT apps [macosx]

Browse Source 
Reviewed-by: anthony
This commit is contained in:
Michael McMahon 2012-03-08 14:38:26 +00:00
parent 7352937e75
commit 57a9560def
6 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/make/com/apple/osxui/Makefile
View File

@ -98,7 +98,7 @@ CPPFLAGS += \
OTHER_LDLIBS = \
-lawt -losxapp \
-llwawt -L$(LIBDIR)/lwawt -Xlinker -rpath -Xlinker @loader_path/lwawt \
-lawt_lwawt -L$(LIBDIR) -Xlinker -rpath -Xlinker @loader_path \
-framework Cocoa \
-framework Carbon \
-framework ApplicationServices \

5
jdk/make/sun/headless/Makefile
View File

@ -29,11 +29,6 @@ NO_ROBOT = true
MOTIF_VERSION = none
MOTIF_VERSION_STRING=none
ifeq ($(PLATFORM), macosx)
LIB_LOCATION = $(LIBDIR)/headless
else
endif
PACKAGE = sun.awt
LIBRARY = awt_headless
PRODUCT = sun

2
jdk/make/sun/jawt/Makefile
View File

@ -133,7 +133,7 @@ endif # PLATFORM
ifeq ($(PLATFORM), macosx)
vpath %.m $(call NativeSrcDirList,,native/sun/awt)
OTHER_LDLIBS = -llwawt -L$(LIBDIR)/lwawt -Xlinker -rpath -Xlinker @loader_path/lwawt \
OTHER_LDLIBS = -lawt_lwawt -L$(LIBDIR) -Xlinker -rpath -Xlinker @loader_path \
-framework Cocoa
endif # PLATFORM

4
jdk/make/sun/lwawt/Makefile
View File

@ -26,10 +26,10 @@
BUILDDIR = ../..
MODULE = awt
PACKAGE = sun.lwawt
LIBRARY = lwawt
LIBRARY = awt_lwawt
PRODUCT = sun
LIB_LOCATION = $(LIBDIR)/lwawt
LIB_LOCATION = $(LIBDIR)
include $(BUILDDIR)/common/Defs.gmk

4
jdk/make/sun/xawt/Makefile
View File

@ -28,10 +28,6 @@ PACKAGE = sun.awt.X11
LIBRARY = awt_xawt
PRODUCT = sun
ifeq ($(PLATFORM), macosx)
LIB_LOCATION = $(LIBDIR)/xawt
endif
include $(BUILDDIR)/common/Defs.gmk
GEN_DIR=$(GENSRCDIR)/sun/awt/X11

7
jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c
View File

@ -77,11 +77,12 @@ JNIEXPORT jboolean JNICALL AWTIsHeadless() {
* Pathnames to the various awt toolkits
*/
#ifdef MACOSX
#define XAWT_PATH "/xawt/libawt_xawt.dylib"
#define LWAWT_PATH "/lwawt/liblwawt.dylib"
#define XAWT_PATH "/libawt_xawt.dylib"
#define LWAWT_PATH "/libawt_lwawt.dylib"
#define DEFAULT_PATH LWAWT_PATH
#define HEADLESS_PATH "/headless/libawt_headless.dylib"
#define HEADLESS_PATH "/libawt_headless.dylib"
#else
#define XAWT_PATH "/libawt_xawt.so"
#define DEFAULT_PATH XAWT_PATH