Changeset 8283 for trunk

Timestamp:

08/12/11 14:50:25 (6 months ago)

Author:

westram

Message:

• compile on suse 12.1

Location:

trunk

Files:

• GL/glAW/GLwDrawA.c (modified) (1 diff)
• Makefile (modified) (1 diff)
• arb_INSTALL.txt (modified) (2 diffs)

trunk/GL/glAW/GLwDrawA.c

@@ -603 +603 @@
     cb.height = glw->core.height;
     XtCallCallbackList((Widget)glw, glw->glwDrawingArea.inputCallback, &cb);
-  }
-
-
-#ifdef __GLX_MOTIF
-
-// Create routine
+}
+
+void GLwDrawingAreaMakeCurrent(Widget w, GLXContext ctx) {
+    // Make context current
+    // ARB note: define it independent from __GLX_MOTIF (undefined on suse12.1) 
+    glXMakeCurrent(XtDisplay(w), XtWindow(w), ctx);
+}
+
+#ifdef __GLX_MOTIF
+
 Widget GLwCreateMDrawingArea(Widget parent, char *name, ArgList arglist, Cardinal argcount) {
-  return XtCreateWidget(name, glwMDrawingAreaWidgetClass, parent, arglist, argcount);
-  }
-
-#endif
-
-
-#ifndef __GLX_MOTIF
-
-// Make context current
-void GLwDrawingAreaMakeCurrent(Widget w, GLXContext ctx) {
-  glXMakeCurrent(XtDisplay(w), XtWindow(w), ctx);
-  }
-
-
-// Swap buffers convenience function
+    // Create routine
+    return XtCreateWidget(name, glwMDrawingAreaWidgetClass, parent, arglist, argcount);
+}
+
+#else
+
 void GLwDrawingAreaSwapBuffers(Widget w) {
-  glXSwapBuffers(XtDisplay(w), XtWindow(w));
-  }
-
-#endif
+    // Swap buffers convenience function
+    glXSwapBuffers(XtDisplay(w), XtWindow(w));
+}
+
+#endif

trunk/Makefile

@@ -59 +59 @@
         4.4 4.4.1 4.4.3 4.4.5 \
         4.5.2 \
-        4.6.1
+        4.6 4.6.1
 
 ALLOWED_GCC_VERSIONS=$(ALLOWED_GCC_4xx_VERSIONS)

trunk/arb_INSTALL.txt

@@ -114 +114 @@
 --------------------------------------------------
 
-- expat, xmllint, sablotron 0.82-1.0 [needed for target 'help' only]
+- expat, xmllint, xsltproc [needed for target 'help' only]
 - openmotif, openmotif-devel
 - xaw???
 - libtiff-devel
-- java 1.3.1 or above [needed for arb_probe_library only]
 - lynx
 
@@ -128 +127 @@
 - mesaglw-devel (opensuse)
 - libpng
-- libglew                 
+- libglew
+- glew-devel (opensuse)
 - freeglut
 - freeglut-devel