--- a/GLXWorkstation.st Fri Feb 07 15:23:19 2014 +0100
+++ b/GLXWorkstation.st Sat Feb 08 22:42:13 2014 +0100
@@ -78,6 +78,10 @@
#endif
#include <stdio.h>
+#ifdef __osx__
+# include <sys/signal.h>
+# define DYNAMICALLY_LOADABLE
+#endif
#ifndef OPENGL
# ifdef MESA
@@ -3062,19 +3066,19 @@
the floatArray props. Props must be delimited by a 0.0 entry."
%{ /* NOCONTEXT */
-#ifdef GLX
+#ifdef GLX
unsigned char *cp;
const float *fp;
OBJ cls;
float fbuff[30];
if (__isByteArrayLike(image)) {
- cp = _ByteArrayInstPtr(image)->ba_element;
- fp = __glx_getFloatsFromFloatArrayInto(props, fbuff);
-
- SETWIN(aGLXWindowId)
- texdef2d(__intVal(index), __intVal(nc), __intVal(w), __intVal(h),
- (const unsigned long *)cp, __intVal(np), fp);
+ cp = _ByteArrayInstPtr(image)->ba_element;
+ fp = __glx_getFloatsFromFloatArrayInto(props, fbuff);
+
+ SETWIN(aGLXWindowId)
+ texdef2d(__intVal(index), __intVal(nc), __intVal(w), __intVal(h),
+ (const unsigned long *)cp, __intVal(np), fp);
}
#endif
%}
@@ -3095,13 +3099,13 @@
float fbuff[30];
if (__isByteArrayLike(image)) {
- cp = _ByteArrayInstPtr(image)->ba_element;
- fp = __glx_getFloatsFromFloatArrayInto(props, fbuff);
-
- SETWIN(aGLXWindowId)
- texdef3d(__intVal(index), __intVal(nc), __intVal(w), __intVal(h),
- __intVal(d),
- (const unsigned long *)cp, __intVal(np), fp);
+ cp = _ByteArrayInstPtr(image)->ba_element;
+ fp = __glx_getFloatsFromFloatArrayInto(props, fbuff);
+
+ SETWIN(aGLXWindowId)
+ texdef3d(__intVal(index), __intVal(nc), __intVal(w), __intVal(h),
+ __intVal(d),
+ (const unsigned long *)cp, __intVal(np), fp);
}
#endif
%}
@@ -8782,9 +8786,9 @@
!GLXWorkstation class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/GLXWorkstation.st,v 1.86 2013-02-03 21:07:03 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/GLXWorkstation.st,v 1.87 2014-02-08 21:42:13 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libview/GLXWorkstation.st,v 1.86 2013-02-03 21:07:03 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/GLXWorkstation.st,v 1.87 2014-02-08 21:42:13 cg Exp $'
! !