Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrant Gayed2004-09-13 20:58:46 +0000
committerGrant Gayed2004-09-13 20:58:46 +0000
commitc8b6414012eef8088b8bfa78d345c6a387090f86 (patch)
tree0502f7bdcdf58b3c7361b1e204a93273e86bf370 /bundles
parent6c445fa40117628797fe24caaee84df89d66fbda (diff)
downloadeclipse.platform.swt-c8b6414012eef8088b8bfa78d345c6a387090f86.tar.gz
eclipse.platform.swt-c8b6414012eef8088b8bfa78d345c6a387090f86.tar.xz
eclipse.platform.swt-c8b6414012eef8088b8bfa78d345c6a387090f86.zip
*** keyword substitution change ***
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.swt.opengl/motif/library/glx.c464
-rw-r--r--bundles/org.eclipse.swt.opengl/motif/library/make_aix.mak80
-rw-r--r--bundles/org.eclipse.swt.opengl/motif/library/make_hpux.mak88
-rw-r--r--bundles/org.eclipse.swt.opengl/motif/library/make_linux.mak76
-rw-r--r--bundles/org.eclipse.swt.opengl/motif/library/make_solaris.mak90
-rw-r--r--bundles/org.eclipse.swt.opengl/motif/library/structs.c146
-rw-r--r--bundles/org.eclipse.swt.opengl/motif/library/structs.h32
7 files changed, 488 insertions, 488 deletions
diff --git a/bundles/org.eclipse.swt.opengl/motif/library/glx.c b/bundles/org.eclipse.swt.opengl/motif/library/glx.c
index 550951bf04..4fca4eb8eb 100644
--- a/bundles/org.eclipse.swt.opengl/motif/library/glx.c
+++ b/bundles/org.eclipse.swt.opengl/motif/library/glx.c
@@ -1,232 +1,232 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-#include <GL/glx.h>
-#include "swt.h"
-#include "structs.h"
-
-#define XGL_NATIVE(func) Java_org_eclipse_swt_opengl_internal_motif_XGL_##func
-
-JNIEXPORT jint JNICALL XGL_NATIVE(glXChooseVisual)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
-{
- jint *lparg2=NULL;
- jint rc;
-
- DEBUG_CALL("glXChooseVisual\n")
-
- if (arg2) lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL);
- rc = (jint)glXChooseVisual((Display *)arg0, arg1, (int *)lparg2);
- if (arg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
- return rc;
-}
-
-JNIEXPORT void JNICALL XGL_NATIVE(glXCopyContext)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-{
- DEBUG_CALL("glXCopyContext\n")
-
- glXCopyContext((Display *)arg0, (GLXContext)arg1, (GLXContext)arg2, arg3);
-}
-
-JNIEXPORT jint JNICALL XGL_NATIVE(glXCreateContext)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jboolean arg3)
-{
- XVisualInfo _arg1, *lparg1=NULL;
- jint rc;
-
- DEBUG_CALL("glXCreateContext\n")
-
- if (arg1) lparg1 = getXVisualInfoFields(env, arg1, &_arg1);
- rc = (jint)glXCreateContext((Display *)arg0, lparg1, (GLXContext)arg2, arg3);
- if (arg1) setXVisualInfoFields(env, arg1, lparg1);
- return rc;
-}
-
-JNIEXPORT jint JNICALL XGL_NATIVE(glXCreateGLXPixmap)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
-{
- XVisualInfo _arg1, *lparg1=NULL;
- jint rc;
-
- DEBUG_CALL("glXCreateGLXPixmap\n")
-
- if (arg1) lparg1 = getXVisualInfoFields(env, arg1, &_arg1);
- rc = (jint)glXCreateGLXPixmap((Display *)arg0, lparg1, arg2);
- if (arg1) setXVisualInfoFields(env, arg1, lparg1);
- return rc;
-}
-
-JNIEXPORT void JNICALL XGL_NATIVE(glXDestroyContext)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-{
- DEBUG_CALL("glXDestroyContext\n")
-
- glXDestroyContext((Display *)arg0, (GLXContext)arg1);
-}
-
-JNIEXPORT void JNICALL XGL_NATIVE(glXDestroyGLXPixmap)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-{
- DEBUG_CALL("glXDestroyGLXPixmap\n")
-
- glXDestroyGLXPixmap((Display *)arg0, arg1);
-}
-
-JNIEXPORT jint JNICALL XGL_NATIVE(glXGetClientString)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-{
- DEBUG_CALL("glXGetClientString\n")
-
- return (jint)glXGetClientString((Display *)arg0, arg1);
-}
-
-JNIEXPORT jint JNICALL XGL_NATIVE(glXGetConfig)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jintArray arg3)
-{
- XVisualInfo _arg1, *lparg1=NULL;
- jint *lparg3=NULL;
- jint rc;
-
- DEBUG_CALL("glXGetConfig\n")
-
- if (arg1) lparg1 = getXVisualInfoFields(env, arg1, &_arg1);
- if (arg3) lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL);
- rc = (jint)glXGetConfig((Display *)arg0, lparg1, arg2, (int *)lparg3);
- if (arg1) setXVisualInfoFields(env, arg1, lparg1);
- if (arg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
- return rc;
-}
-
-JNIEXPORT jint JNICALL XGL_NATIVE(glXGetCurrentContext)
- (JNIEnv *env, jclass that)
-{
- DEBUG_CALL("glXGetCurrentContext\n")
-
- return (jint)glXGetCurrentContext();
-}
-
-JNIEXPORT jint JNICALL XGL_NATIVE(glXGetCurrentDrawable)
- (JNIEnv *env, jclass that)
-{
- DEBUG_CALL("glXGetCurrentDrawable\n")
-
- return (jint)glXGetCurrentDrawable();
-}
-
-JNIEXPORT jboolean JNICALL XGL_NATIVE(glXIsDirect)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-{
- DEBUG_CALL("glXIsDirect\n")
-
- return (jboolean)glXIsDirect((Display *)arg0, (GLXContext)arg1);
-}
-
-JNIEXPORT jboolean JNICALL XGL_NATIVE(glXMakeCurrent)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-{
- DEBUG_CALL("glXMakeCurrent\n")
-
- return (jboolean)glXMakeCurrent((Display *)arg0, (GLXDrawable)arg1, (GLXContext)arg2);
-}
-
-JNIEXPORT jboolean JNICALL XGL_NATIVE(glXQueryExtension)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
-{
- jint *lparg1=NULL;
- jint *lparg2=NULL;
- jboolean rc;
-
- DEBUG_CALL("glXQueryExtension\n")
-
- if (arg1) lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL);
- if (arg2) lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL);
- rc = (jboolean)glXQueryExtension((Display *)arg0, (int *)lparg1, (int *)lparg2);
- if (arg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
- if (arg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
- return rc;
-}
-
-JNIEXPORT jint JNICALL XGL_NATIVE(glXQueryExtensionsString)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-{
- DEBUG_CALL("glXQueryExtensionsString\n")
-
- return (jint)glXQueryExtensionsString((Display *)arg0, arg1);
-}
-
-JNIEXPORT jint JNICALL XGL_NATIVE(glXQueryServerString)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-{
- DEBUG_CALL("glXQueryServerString\n")
-
- return (jint)glXQueryServerString((Display *)arg0, arg1, arg2);
-}
-
-JNIEXPORT jboolean JNICALL XGL_NATIVE(glXQueryVersion)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
-{
- jint *lparg1=NULL;
- jint *lparg2=NULL;
- jboolean rc;
-
- DEBUG_CALL("glXQueryVersion\n")
-
- if (arg1) lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL);
- if (arg2) lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL);
- rc = (jboolean)glXQueryVersion((Display *)arg0, (int *)lparg1, (int *)lparg2);
- if (arg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
- if (arg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
- return rc;
-}
-
-JNIEXPORT void JNICALL XGL_NATIVE(glXSwapBuffers)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-{
- DEBUG_CALL("glXSwapBuffers\n")
-
- glXSwapBuffers((Display *)arg0, (GLXDrawable)arg1);
-}
-
-JNIEXPORT void JNICALL XGL_NATIVE(glXUseXFont)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-{
- DEBUG_CALL("glXUseXFont\n")
-
- glXUseXFont(arg0, arg1, arg2, arg3);
-}
-
-JNIEXPORT void JNICALL XGL_NATIVE(glXWaitGL)
- (JNIEnv *env, jclass that)
-{
- DEBUG_CALL("glXWaitGL\n")
-
- glXWaitGL();
-}
-
-JNIEXPORT void JNICALL XGL_NATIVE(glXWaitX)
- (JNIEnv *env, jclass that)
-{
- DEBUG_CALL("glXWaitX\n")
-
- glXWaitX();
-}
-
-JNIEXPORT void JNICALL XGL_NATIVE(memmove__Lorg_eclipse_swt_opengl_internal_motif_XVisualInfo_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-{
- XVisualInfo _arg0, *lparg0=NULL;
-
- DEBUG_CALL("memmove__Lorg_eclipse_swt_opengl_internal_motif_XVisualInfo_2II\n")
-
- if (arg0) lparg0 = &_arg0;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- if (arg0) setXVisualInfoFields(env, arg0, lparg0);
-}
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+#include <GL/glx.h>
+#include "swt.h"
+#include "structs.h"
+
+#define XGL_NATIVE(func) Java_org_eclipse_swt_opengl_internal_motif_XGL_##func
+
+JNIEXPORT jint JNICALL XGL_NATIVE(glXChooseVisual)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+{
+ jint *lparg2=NULL;
+ jint rc;
+
+ DEBUG_CALL("glXChooseVisual\n")
+
+ if (arg2) lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL);
+ rc = (jint)glXChooseVisual((Display *)arg0, arg1, (int *)lparg2);
+ if (arg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+ return rc;
+}
+
+JNIEXPORT void JNICALL XGL_NATIVE(glXCopyContext)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+{
+ DEBUG_CALL("glXCopyContext\n")
+
+ glXCopyContext((Display *)arg0, (GLXContext)arg1, (GLXContext)arg2, arg3);
+}
+
+JNIEXPORT jint JNICALL XGL_NATIVE(glXCreateContext)
+ (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jboolean arg3)
+{
+ XVisualInfo _arg1, *lparg1=NULL;
+ jint rc;
+
+ DEBUG_CALL("glXCreateContext\n")
+
+ if (arg1) lparg1 = getXVisualInfoFields(env, arg1, &_arg1);
+ rc = (jint)glXCreateContext((Display *)arg0, lparg1, (GLXContext)arg2, arg3);
+ if (arg1) setXVisualInfoFields(env, arg1, lparg1);
+ return rc;
+}
+
+JNIEXPORT jint JNICALL XGL_NATIVE(glXCreateGLXPixmap)
+ (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+{
+ XVisualInfo _arg1, *lparg1=NULL;
+ jint rc;
+
+ DEBUG_CALL("glXCreateGLXPixmap\n")
+
+ if (arg1) lparg1 = getXVisualInfoFields(env, arg1, &_arg1);
+ rc = (jint)glXCreateGLXPixmap((Display *)arg0, lparg1, arg2);
+ if (arg1) setXVisualInfoFields(env, arg1, lparg1);
+ return rc;
+}
+
+JNIEXPORT void JNICALL XGL_NATIVE(glXDestroyContext)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+ DEBUG_CALL("glXDestroyContext\n")
+
+ glXDestroyContext((Display *)arg0, (GLXContext)arg1);
+}
+
+JNIEXPORT void JNICALL XGL_NATIVE(glXDestroyGLXPixmap)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+ DEBUG_CALL("glXDestroyGLXPixmap\n")
+
+ glXDestroyGLXPixmap((Display *)arg0, arg1);
+}
+
+JNIEXPORT jint JNICALL XGL_NATIVE(glXGetClientString)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+ DEBUG_CALL("glXGetClientString\n")
+
+ return (jint)glXGetClientString((Display *)arg0, arg1);
+}
+
+JNIEXPORT jint JNICALL XGL_NATIVE(glXGetConfig)
+ (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jintArray arg3)
+{
+ XVisualInfo _arg1, *lparg1=NULL;
+ jint *lparg3=NULL;
+ jint rc;
+
+ DEBUG_CALL("glXGetConfig\n")
+
+ if (arg1) lparg1 = getXVisualInfoFields(env, arg1, &_arg1);
+ if (arg3) lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL);
+ rc = (jint)glXGetConfig((Display *)arg0, lparg1, arg2, (int *)lparg3);
+ if (arg1) setXVisualInfoFields(env, arg1, lparg1);
+ if (arg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+ return rc;
+}
+
+JNIEXPORT jint JNICALL XGL_NATIVE(glXGetCurrentContext)
+ (JNIEnv *env, jclass that)
+{
+ DEBUG_CALL("glXGetCurrentContext\n")
+
+ return (jint)glXGetCurrentContext();
+}
+
+JNIEXPORT jint JNICALL XGL_NATIVE(glXGetCurrentDrawable)
+ (JNIEnv *env, jclass that)
+{
+ DEBUG_CALL("glXGetCurrentDrawable\n")
+
+ return (jint)glXGetCurrentDrawable();
+}
+
+JNIEXPORT jboolean JNICALL XGL_NATIVE(glXIsDirect)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+ DEBUG_CALL("glXIsDirect\n")
+
+ return (jboolean)glXIsDirect((Display *)arg0, (GLXContext)arg1);
+}
+
+JNIEXPORT jboolean JNICALL XGL_NATIVE(glXMakeCurrent)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+{
+ DEBUG_CALL("glXMakeCurrent\n")
+
+ return (jboolean)glXMakeCurrent((Display *)arg0, (GLXDrawable)arg1, (GLXContext)arg2);
+}
+
+JNIEXPORT jboolean JNICALL XGL_NATIVE(glXQueryExtension)
+ (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+{
+ jint *lparg1=NULL;
+ jint *lparg2=NULL;
+ jboolean rc;
+
+ DEBUG_CALL("glXQueryExtension\n")
+
+ if (arg1) lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL);
+ if (arg2) lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL);
+ rc = (jboolean)glXQueryExtension((Display *)arg0, (int *)lparg1, (int *)lparg2);
+ if (arg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ if (arg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+ return rc;
+}
+
+JNIEXPORT jint JNICALL XGL_NATIVE(glXQueryExtensionsString)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+ DEBUG_CALL("glXQueryExtensionsString\n")
+
+ return (jint)glXQueryExtensionsString((Display *)arg0, arg1);
+}
+
+JNIEXPORT jint JNICALL XGL_NATIVE(glXQueryServerString)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+{
+ DEBUG_CALL("glXQueryServerString\n")
+
+ return (jint)glXQueryServerString((Display *)arg0, arg1, arg2);
+}
+
+JNIEXPORT jboolean JNICALL XGL_NATIVE(glXQueryVersion)
+ (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+{
+ jint *lparg1=NULL;
+ jint *lparg2=NULL;
+ jboolean rc;
+
+ DEBUG_CALL("glXQueryVersion\n")
+
+ if (arg1) lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL);
+ if (arg2) lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL);
+ rc = (jboolean)glXQueryVersion((Display *)arg0, (int *)lparg1, (int *)lparg2);
+ if (arg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ if (arg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+ return rc;
+}
+
+JNIEXPORT void JNICALL XGL_NATIVE(glXSwapBuffers)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+ DEBUG_CALL("glXSwapBuffers\n")
+
+ glXSwapBuffers((Display *)arg0, (GLXDrawable)arg1);
+}
+
+JNIEXPORT void JNICALL XGL_NATIVE(glXUseXFont)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+{
+ DEBUG_CALL("glXUseXFont\n")
+
+ glXUseXFont(arg0, arg1, arg2, arg3);
+}
+
+JNIEXPORT void JNICALL XGL_NATIVE(glXWaitGL)
+ (JNIEnv *env, jclass that)
+{
+ DEBUG_CALL("glXWaitGL\n")
+
+ glXWaitGL();
+}
+
+JNIEXPORT void JNICALL XGL_NATIVE(glXWaitX)
+ (JNIEnv *env, jclass that)
+{
+ DEBUG_CALL("glXWaitX\n")
+
+ glXWaitX();
+}
+
+JNIEXPORT void JNICALL XGL_NATIVE(memmove__Lorg_eclipse_swt_opengl_internal_motif_XVisualInfo_2II)
+ (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+{
+ XVisualInfo _arg0, *lparg0=NULL;
+
+ DEBUG_CALL("memmove__Lorg_eclipse_swt_opengl_internal_motif_XVisualInfo_2II\n")
+
+ if (arg0) lparg0 = &_arg0;
+ memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
+ if (arg0) setXVisualInfoFields(env, arg0, lparg0);
+}
diff --git a/bundles/org.eclipse.swt.opengl/motif/library/make_aix.mak b/bundles/org.eclipse.swt.opengl/motif/library/make_aix.mak
index d34e404ce0..6928cabd4e 100644
--- a/bundles/org.eclipse.swt.opengl/motif/library/make_aix.mak
+++ b/bundles/org.eclipse.swt.opengl/motif/library/make_aix.mak
@@ -1,40 +1,40 @@
-#*******************************************************************************
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-#*******************************************************************************
-
-# Define the installation directories for various products.
-# JAVA_HOME - The JDK > 1.3
-JAVA_HOME = /usr/java131
-
-# Define the various shared libraries to be made.
-SWT_PREFIX = swt
-WS_PREFIX = motif
-SWT_DLL = lib$(SWT_PREFIX)-$(WS_PREFIX).so
-SWT_OBJ = gl.o glu.o structs.o glx.o
-SWT_LIB = -G -bnoentry -lc_r -lC_r -lm -bexpall -lMrm -lX11 -lXext -liconv -lGL -lGLU
-
-#
-# The following CFLAGS are for compiling the SWT OpenGL library.
-#
-CFLAGS = -O -s \
- -DAIX \
- -DNO_XINERAMA_EXTENSIONS \
- -q mbcs -qlanglvl=extended -qmaxmem=8192 \
- -I$(JAVA_HOME)/include
-
-all: make_swt
-
-make_swt: $(SWT_DLL)
-
-$(SWT_DLL): $(SWT_OBJ)
- ld $(SWT_LIB) -o $(SWT_DLL) $(SWT_OBJ)
-
-clean:
- rm -f *.o *.so *.a
+#*******************************************************************************
+# Copyright (c) 2000, 2003 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Common Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/cpl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+#*******************************************************************************
+
+# Define the installation directories for various products.
+# JAVA_HOME - The JDK > 1.3
+JAVA_HOME = /usr/java131
+
+# Define the various shared libraries to be made.
+SWT_PREFIX = swt
+WS_PREFIX = motif
+SWT_DLL = lib$(SWT_PREFIX)-$(WS_PREFIX).so
+SWT_OBJ = gl.o glu.o structs.o glx.o
+SWT_LIB = -G -bnoentry -lc_r -lC_r -lm -bexpall -lMrm -lX11 -lXext -liconv -lGL -lGLU
+
+#
+# The following CFLAGS are for compiling the SWT OpenGL library.
+#
+CFLAGS = -O -s \
+ -DAIX \
+ -DNO_XINERAMA_EXTENSIONS \
+ -q mbcs -qlanglvl=extended -qmaxmem=8192 \
+ -I$(JAVA_HOME)/include
+
+all: make_swt
+
+make_swt: $(SWT_DLL)
+
+$(SWT_DLL): $(SWT_OBJ)
+ ld $(SWT_LIB) -o $(SWT_DLL) $(SWT_OBJ)
+
+clean:
+ rm -f *.o *.so *.a
diff --git a/bundles/org.eclipse.swt.opengl/motif/library/make_hpux.mak b/bundles/org.eclipse.swt.opengl/motif/library/make_hpux.mak
index 746f708fc7..16648de5f0 100644
--- a/bundles/org.eclipse.swt.opengl/motif/library/make_hpux.mak
+++ b/bundles/org.eclipse.swt.opengl/motif/library/make_hpux.mak
@@ -1,44 +1,44 @@
-#*******************************************************************************
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-#*******************************************************************************
-
-# Define the installation directories for various products.
-JAVA_HOME = /opt/java1.3
-
-# Define the various shared libraries to be made.
-SWT_PREFIX = gl
-WS_PREFIX = motif
-SWT_DLL = lib$(SWT_PREFIX)-$(WS_PREFIX).sl
-SWT_OBJ = gl.o glu.o structs.o glx.o
-SWT_LIB = -L/usr/lib -L/opt/graphics/OpenGL/lib -G -lGL -lGLU -lc -ldld -lm
-
-#
-# The following CFLAGS are for compiling the SWT OpenGL library.
-#
-# Note:
-# The flag -xarch=generic ensure the compiled modules will be targeted
-# for 32-bit architectures. If this flag is not
-#
-CFLAGS = -Ae +z \
- -DNO_XINERAMA_EXTENSIONS \
- -D_HPUX -D_POSIX_C_SOURCE=199506L \
- -I./ \
- -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/hp-ux \
- -I/opt/graphics/OpenGL/include
-
-all: make_swt
-
-make_swt: $(SWT_DLL)
-
-$(SWT_DLL): $(SWT_OBJ)
- ld -b -z -o $@ $(SWT_OBJ) $(SWT_LIB)
-
-clean:
- rm -f *.sl *.o
+#*******************************************************************************
+# Copyright (c) 2000, 2003 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Common Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/cpl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+#*******************************************************************************
+
+# Define the installation directories for various products.
+JAVA_HOME = /opt/java1.3
+
+# Define the various shared libraries to be made.
+SWT_PREFIX = gl
+WS_PREFIX = motif
+SWT_DLL = lib$(SWT_PREFIX)-$(WS_PREFIX).sl
+SWT_OBJ = gl.o glu.o structs.o glx.o
+SWT_LIB = -L/usr/lib -L/opt/graphics/OpenGL/lib -G -lGL -lGLU -lc -ldld -lm
+
+#
+# The following CFLAGS are for compiling the SWT OpenGL library.
+#
+# Note:
+# The flag -xarch=generic ensure the compiled modules will be targeted
+# for 32-bit architectures. If this flag is not
+#
+CFLAGS = -Ae +z \
+ -DNO_XINERAMA_EXTENSIONS \
+ -D_HPUX -D_POSIX_C_SOURCE=199506L \
+ -I./ \
+ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/hp-ux \
+ -I/opt/graphics/OpenGL/include
+
+all: make_swt
+
+make_swt: $(SWT_DLL)
+
+$(SWT_DLL): $(SWT_OBJ)
+ ld -b -z -o $@ $(SWT_OBJ) $(SWT_LIB)
+
+clean:
+ rm -f *.sl *.o
diff --git a/bundles/org.eclipse.swt.opengl/motif/library/make_linux.mak b/bundles/org.eclipse.swt.opengl/motif/library/make_linux.mak
index 4b8075f797..755895fe3d 100644
--- a/bundles/org.eclipse.swt.opengl/motif/library/make_linux.mak
+++ b/bundles/org.eclipse.swt.opengl/motif/library/make_linux.mak
@@ -1,38 +1,38 @@
-#*******************************************************************************
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-#*******************************************************************************
-
-# Define the installation directories for various products.
-JAVA_HOME = /bluebird/teamswt/swt-builddir/ive/bin
-
-
-# Define the various shared libraries to be made.
-SWT_PREFIX = gl
-WS_PREFIX = motif
-SWT_DLL = lib$(SWT_PREFIX)-$(WS_PREFIX).so
-SWT_OBJ = gl.o glu.o structs.o glx.o
-SWT_LIB = -shared -L/usr/X11R6/lib -lGL -lGLU -lm
-
-#
-# The following CFLAGS are for compiling the SWT OpenGL library.
-#
-CFLAGS = -O -s \
- -I./ \
- -I$(JAVA_HOME)/include
-
-all: make_swt
-
-make_swt: $(SWT_DLL)
-
-$(SWT_DLL): $(SWT_OBJ)
- ld -o $@ $(SWT_OBJ) $(SWT_LIB)
-
-clean:
- rm -f *.so *.o
+#*******************************************************************************
+# Copyright (c) 2000, 2003 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Common Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/cpl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+#*******************************************************************************
+
+# Define the installation directories for various products.
+JAVA_HOME = /bluebird/teamswt/swt-builddir/ive/bin
+
+
+# Define the various shared libraries to be made.
+SWT_PREFIX = gl
+WS_PREFIX = motif
+SWT_DLL = lib$(SWT_PREFIX)-$(WS_PREFIX).so
+SWT_OBJ = gl.o glu.o structs.o glx.o
+SWT_LIB = -shared -L/usr/X11R6/lib -lGL -lGLU -lm
+
+#
+# The following CFLAGS are for compiling the SWT OpenGL library.
+#
+CFLAGS = -O -s \
+ -I./ \
+ -I$(JAVA_HOME)/include
+
+all: make_swt
+
+make_swt: $(SWT_DLL)
+
+$(SWT_DLL): $(SWT_OBJ)
+ ld -o $@ $(SWT_OBJ) $(SWT_LIB)
+
+clean:
+ rm -f *.so *.o
diff --git a/bundles/org.eclipse.swt.opengl/motif/library/make_solaris.mak b/bundles/org.eclipse.swt.opengl/motif/library/make_solaris.mak
index fe02ac50d6..1b08b07f47 100644
--- a/bundles/org.eclipse.swt.opengl/motif/library/make_solaris.mak
+++ b/bundles/org.eclipse.swt.opengl/motif/library/make_solaris.mak
@@ -1,45 +1,45 @@
-#*******************************************************************************
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-#*******************************************************************************
-
-# Define the installation directories for various products.
-JAVA_HOME = /bluebird/teamswt/swt-builddir/ive/bin
-
-# Define the various shared libraries to be made.
-SWT_PREFIX = gl
-WS_PREFIX = motif
-SWT_DLL = lib$(SWT_PREFIX)-$(WS_PREFIX).so
-SWT_OBJ = gl.o glu.o structs.o glx.o
-SWT_LIB = -G -L/usr/lib -lm -lGL -lGLU
-
-#
-# The following CFLAGS are for compiling the SWT OpenGL library.
-#
-# Note:
-# The flag -xarch=generic ensure the compiled modules will be targeted
-# for 32-bit architectures.
-#
-CFLAGS = -O -s \
- -xarch=generic \
- -KPIC \
- -I./ \
- -I$(JAVA_HOME)/include
-
-all: make_swt
-
-make_swt: $(SWT_DLL)
-
-$(SWT_DLL): $(SWT_OBJ)
- ld -o $@ $(SWT_OBJ) $(SWT_LIB)
-
-clean:
- rm -f *.so *.o
-
-
+#*******************************************************************************
+# Copyright (c) 2000, 2003 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Common Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/cpl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+#*******************************************************************************
+
+# Define the installation directories for various products.
+JAVA_HOME = /bluebird/teamswt/swt-builddir/ive/bin
+
+# Define the various shared libraries to be made.
+SWT_PREFIX = gl
+WS_PREFIX = motif
+SWT_DLL = lib$(SWT_PREFIX)-$(WS_PREFIX).so
+SWT_OBJ = gl.o glu.o structs.o glx.o
+SWT_LIB = -G -L/usr/lib -lm -lGL -lGLU
+
+#
+# The following CFLAGS are for compiling the SWT OpenGL library.
+#
+# Note:
+# The flag -xarch=generic ensure the compiled modules will be targeted
+# for 32-bit architectures.
+#
+CFLAGS = -O -s \
+ -xarch=generic \
+ -KPIC \
+ -I./ \
+ -I$(JAVA_HOME)/include
+
+all: make_swt
+
+make_swt: $(SWT_DLL)
+
+$(SWT_DLL): $(SWT_OBJ)
+ ld -o $@ $(SWT_OBJ) $(SWT_LIB)
+
+clean:
+ rm -f *.so *.o
+
+
diff --git a/bundles/org.eclipse.swt.opengl/motif/library/structs.c b/bundles/org.eclipse.swt.opengl/motif/library/structs.c
index 368852dc33..bf8db55dfa 100644
--- a/bundles/org.eclipse.swt.opengl/motif/library/structs.c
+++ b/bundles/org.eclipse.swt.opengl/motif/library/structs.c
@@ -1,73 +1,73 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-#include <X11/X.h>
-#include <X11/Xlib.h>
-#include "swt.h"
-#include "structs.h"
-
-typedef struct XVisualInfo_FID_CACHE {
- int cached;
- jclass clazz;
- jfieldID visual, visualid, screen, depth, cclass, red_mask, green_mask, blue_mask, colormap_size, bits_per_rgb;
-} XVisualInfo_FID_CACHE;
-typedef XVisualInfo_FID_CACHE *PXVisualInfo_FID_CACHE;
-
-XVisualInfo_FID_CACHE XVisualInfoFc;
-
-void cacheXVisualInfoFids(JNIEnv *env, jobject lpObject, PXVisualInfo_FID_CACHE lpCache)
-{
- if (lpCache->cached) return;
- lpCache->clazz = (*env)->GetObjectClass(env, lpObject);
- lpCache->visual = (*env)->GetFieldID(env, lpCache->clazz, "visual", "I");
- lpCache->visualid = (*env)->GetFieldID(env, lpCache->clazz, "visualid", "I");
- lpCache->screen = (*env)->GetFieldID(env, lpCache->clazz, "screen", "I");
- lpCache->depth = (*env)->GetFieldID(env, lpCache->clazz, "depth", "I");
- lpCache->cclass = (*env)->GetFieldID(env, lpCache->clazz, "cclass", "I");
- lpCache->red_mask = (*env)->GetFieldID(env, lpCache->clazz, "red_mask", "I");
- lpCache->green_mask = (*env)->GetFieldID(env, lpCache->clazz, "green_mask", "I");
- lpCache->blue_mask = (*env)->GetFieldID(env, lpCache->clazz, "blue_mask", "I");
- lpCache->colormap_size = (*env)->GetFieldID(env, lpCache->clazz, "colormap_size", "I");
- lpCache->bits_per_rgb = (*env)->GetFieldID(env, lpCache->clazz, "bits_per_rgb", "I");
- lpCache->cached = 1;
-}
-
-XVisualInfo *getXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct)
-{
- PXVisualInfo_FID_CACHE lpCache = &XVisualInfoFc;
- if (!lpCache->cached) cacheXVisualInfoFids(env, lpObject, lpCache);
- lpStruct->visual = (Visual *)(*env)->GetIntField(env, lpObject, lpCache->visual);
- lpStruct->visualid = (*env)->GetIntField(env, lpObject, lpCache->visualid);
- lpStruct->screen = (*env)->GetIntField(env, lpObject, lpCache->screen);
- lpStruct->depth = (*env)->GetIntField(env, lpObject, lpCache->depth);
- lpStruct->class = (*env)->GetIntField(env, lpObject, lpCache->cclass);
- lpStruct->red_mask = (*env)->GetIntField(env, lpObject, lpCache->red_mask);
- lpStruct->green_mask = (*env)->GetIntField(env, lpObject, lpCache->green_mask);
- lpStruct->blue_mask = (*env)->GetIntField(env, lpObject, lpCache->blue_mask);
- lpStruct->colormap_size = (*env)->GetIntField(env, lpObject, lpCache->colormap_size);
- lpStruct->bits_per_rgb = (*env)->GetIntField(env, lpObject, lpCache->bits_per_rgb);
- return lpStruct;
-}
-
-void setXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct)
-{
- PXVisualInfo_FID_CACHE lpCache = &XVisualInfoFc;
- if (!lpCache->cached) cacheXVisualInfoFids(env, lpObject, lpCache);
- (*env)->SetIntField(env, lpObject, lpCache->visual, (jint)lpStruct->visual);
- (*env)->SetIntField(env, lpObject, lpCache->visualid, (jint)lpStruct->visualid);
- (*env)->SetIntField(env, lpObject, lpCache->screen, (jint)lpStruct->screen);
- (*env)->SetIntField(env, lpObject, lpCache->depth, (jint)lpStruct->depth);
- (*env)->SetIntField(env, lpObject, lpCache->cclass, (jint)lpStruct->class);
- (*env)->SetIntField(env, lpObject, lpCache->red_mask, (jint)lpStruct->red_mask);
- (*env)->SetIntField(env, lpObject, lpCache->green_mask, (jint)lpStruct->green_mask);
- (*env)->SetIntField(env, lpObject, lpCache->blue_mask, (jint)lpStruct->blue_mask);
- (*env)->SetIntField(env, lpObject, lpCache->colormap_size, (jint)lpStruct->colormap_size);
- (*env)->SetIntField(env, lpObject, lpCache->bits_per_rgb, (jint)lpStruct->bits_per_rgb);
-}
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+#include <X11/X.h>
+#include <X11/Xlib.h>
+#include "swt.h"
+#include "structs.h"
+
+typedef struct XVisualInfo_FID_CACHE {
+ int cached;
+ jclass clazz;
+ jfieldID visual, visualid, screen, depth, cclass, red_mask, green_mask, blue_mask, colormap_size, bits_per_rgb;
+} XVisualInfo_FID_CACHE;
+typedef XVisualInfo_FID_CACHE *PXVisualInfo_FID_CACHE;
+
+XVisualInfo_FID_CACHE XVisualInfoFc;
+
+void cacheXVisualInfoFids(JNIEnv *env, jobject lpObject, PXVisualInfo_FID_CACHE lpCache)
+{
+ if (lpCache->cached) return;
+ lpCache->clazz = (*env)->GetObjectClass(env, lpObject);
+ lpCache->visual = (*env)->GetFieldID(env, lpCache->clazz, "visual", "I");
+ lpCache->visualid = (*env)->GetFieldID(env, lpCache->clazz, "visualid", "I");
+ lpCache->screen = (*env)->GetFieldID(env, lpCache->clazz, "screen", "I");
+ lpCache->depth = (*env)->GetFieldID(env, lpCache->clazz, "depth", "I");
+ lpCache->cclass = (*env)->GetFieldID(env, lpCache->clazz, "cclass", "I");
+ lpCache->red_mask = (*env)->GetFieldID(env, lpCache->clazz, "red_mask", "I");
+ lpCache->green_mask = (*env)->GetFieldID(env, lpCache->clazz, "green_mask", "I");
+ lpCache->blue_mask = (*env)->GetFieldID(env, lpCache->clazz, "blue_mask", "I");
+ lpCache->colormap_size = (*env)->GetFieldID(env, lpCache->clazz, "colormap_size", "I");
+ lpCache->bits_per_rgb = (*env)->GetFieldID(env, lpCache->clazz, "bits_per_rgb", "I");
+ lpCache->cached = 1;
+}
+
+XVisualInfo *getXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct)
+{
+ PXVisualInfo_FID_CACHE lpCache = &XVisualInfoFc;
+ if (!lpCache->cached) cacheXVisualInfoFids(env, lpObject, lpCache);
+ lpStruct->visual = (Visual *)(*env)->GetIntField(env, lpObject, lpCache->visual);
+ lpStruct->visualid = (*env)->GetIntField(env, lpObject, lpCache->visualid);
+ lpStruct->screen = (*env)->GetIntField(env, lpObject, lpCache->screen);
+ lpStruct->depth = (*env)->GetIntField(env, lpObject, lpCache->depth);
+ lpStruct->class = (*env)->GetIntField(env, lpObject, lpCache->cclass);
+ lpStruct->red_mask = (*env)->GetIntField(env, lpObject, lpCache->red_mask);
+ lpStruct->green_mask = (*env)->GetIntField(env, lpObject, lpCache->green_mask);
+ lpStruct->blue_mask = (*env)->GetIntField(env, lpObject, lpCache->blue_mask);
+ lpStruct->colormap_size = (*env)->GetIntField(env, lpObject, lpCache->colormap_size);
+ lpStruct->bits_per_rgb = (*env)->GetIntField(env, lpObject, lpCache->bits_per_rgb);
+ return lpStruct;
+}
+
+void setXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct)
+{
+ PXVisualInfo_FID_CACHE lpCache = &XVisualInfoFc;
+ if (!lpCache->cached) cacheXVisualInfoFids(env, lpObject, lpCache);
+ (*env)->SetIntField(env, lpObject, lpCache->visual, (jint)lpStruct->visual);
+ (*env)->SetIntField(env, lpObject, lpCache->visualid, (jint)lpStruct->visualid);
+ (*env)->SetIntField(env, lpObject, lpCache->screen, (jint)lpStruct->screen);
+ (*env)->SetIntField(env, lpObject, lpCache->depth, (jint)lpStruct->depth);
+ (*env)->SetIntField(env, lpObject, lpCache->cclass, (jint)lpStruct->class);
+ (*env)->SetIntField(env, lpObject, lpCache->red_mask, (jint)lpStruct->red_mask);
+ (*env)->SetIntField(env, lpObject, lpCache->green_mask, (jint)lpStruct->green_mask);
+ (*env)->SetIntField(env, lpObject, lpCache->blue_mask, (jint)lpStruct->blue_mask);
+ (*env)->SetIntField(env, lpObject, lpCache->colormap_size, (jint)lpStruct->colormap_size);
+ (*env)->SetIntField(env, lpObject, lpCache->bits_per_rgb, (jint)lpStruct->bits_per_rgb);
+}
diff --git a/bundles/org.eclipse.swt.opengl/motif/library/structs.h b/bundles/org.eclipse.swt.opengl/motif/library/structs.h
index 80791498e6..4121f7f488 100644
--- a/bundles/org.eclipse.swt.opengl/motif/library/structs.h
+++ b/bundles/org.eclipse.swt.opengl/motif/library/structs.h
@@ -1,16 +1,16 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-#include <X11/X.h>
-#include <X11/Xutil.h>
-
-XVisualInfo *getXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct);
-void setXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct);
-
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+#include <X11/X.h>
+#include <X11/Xutil.h>
+
+XVisualInfo *getXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct);
+void setXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct);
+

Back to the top