From 94b66b7ef4035c453b66a0a80e60c2afbaf310d5 Mon Sep 17 00:00:00 2001 From: Kevin Rushforth Date: Fri, 22 Oct 2004 22:18:16 +0000 Subject: 1. Fixed Issue 80 : libj3dcore-ogl.so fails to load on Linux systems without certain GL extensions 2. Added missing file (src/native/share/build-linux-amd64.xml) to CVS repository for amd64 build. git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@61 ba19aa83-45c5-6ac9-afd3-db810772062c --- src/native/ogl/DrawingSurfaceObjectAWT.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/native/ogl/DrawingSurfaceObjectAWT.c') diff --git a/src/native/ogl/DrawingSurfaceObjectAWT.c b/src/native/ogl/DrawingSurfaceObjectAWT.c index 71e4376..012f5b9 100644 --- a/src/native/ogl/DrawingSurfaceObjectAWT.c +++ b/src/native/ogl/DrawingSurfaceObjectAWT.c @@ -28,11 +28,7 @@ #endif /* DEBUG */ -#if defined(SOLARIS) || defined(__linux__) -#pragma weak JAWT_GetAWT -#endif - -#ifdef SOLARIS +#if defined(SOLARIS) && defined(__sparc) #pragma weak XDgaGetXineramaInfo /* @@ -43,7 +39,7 @@ * standard or replaced with a fully supported API. */ #include "panoramiXext.h" -#endif /* SOLARIS */ +#endif /* SOLARIS && __sparc */ JNIEXPORT jlong JNICALL @@ -64,6 +60,7 @@ Java_javax_media_j3d_MasterControl_getAWT( fprintf(stderr, "AWT not found\n"); return 0; } + return (jlong)awt; } @@ -114,6 +111,7 @@ Java_javax_media_j3d_DrawingSurfaceObjectAWT_getDrawingSurfaceWindowIdAWT( (JAWT_X11DrawingSurfaceInfo*) dsi->platformInfo; window = (jint)xds->drawable; +#ifdef __sparc if (xineramaDisabled) { XineramaInfo xineramaInfo; @@ -143,6 +141,7 @@ Java_javax_media_j3d_DrawingSurfaceObjectAWT_getDrawingSurfaceWindowIdAWT( fprintf(stderr, "Get Xinerama subwid, screen %d failed\n", screen); } } +#endif /* __sparc */ #endif /* SOLARIS */ #ifdef __linux__ -- cgit v1.2.3