1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
--- a/PsychSourceGL/Source/linuxmakeitoctave3_ubuntugutsy.m
+++ b/PsychSourceGL/Source/linuxmakeitoctave3_ubuntugutsy.m
@@ -31,7 +31,7 @@ end
if mode==0
% Build Screen.mex:
- mex -v -g --output ../Projects/Linux/build/Screen.mex -DPTBMODULE_Screen -DPTB_USE_GSTREAMER -DPTBVIDEOCAPTURE_LIBDC -DPTBOCTAVE3MEX -I/usr/X11R6/include -I/usr/include/gstreamer-0.10 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -ICommon/Base -ICommon/Screen -ILinux/Base -ILinux/Screen -L/usr/X11R6/lib Common/Base/*.cc Linux/Base/*.c Linux/Screen/*.c Common/Screen/*.c Common/Base/*.c -lc -lrt -lGL -lGLU -lX11 -lXext -lgstreamer-0.10 -lgstbase-0.10 -lgstapp-0.10 -lgstinterfaces-0.10 -lgobject-2.0 -lgmodule-2.0 -lxml2 -lgthread-2.0 -lglib-2.0 -lXxf86vm -ldc1394 -lusb-1.0 -lpciaccess -lXi -lXrandr
+ mex -v -g --output ../Projects/Linux/build/Screen.mex -DPTBMODULE_Screen -DPTB_USE_GSTREAMER -DPTBVIDEOCAPTURE_LIBDC -DPTBOCTAVE3MEX -I/usr/X11R6/include -I/usr/include/gstreamer-0.10 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -ICommon/Base -ICommon/Screen -ILinux/Base -ILinux/Screen -L/usr/X11R6/lib Common/Base/*.cc Linux/Base/*.c Linux/Screen/*.c Common/Screen/*.c Common/Base/*.c -lc -lrt -lGL -lGLU -lX11 -lXext -lgstreamer-0.10 -lgstbase-0.10 -lgstapp-0.10 -lgstinterfaces-0.10 -lgobject-2.0 -lgmodule-2.0 -lxml2 -lgthread-2.0 -lglib-2.0 -lXxf86vm -ldc1394 -lusb-1.0 -lpciaccess -lGLEW -lXi -lXrandr
unix(['mv ../Projects/Linux/build/Screen.mex ' PsychtoolboxRoot target]);
striplibsfrommexfile([PsychtoolboxRoot target 'Screen.mex']);
end;
@@ -76,7 +76,7 @@ if mode==6
curdir = pwd;
cd('../../Psychtoolbox/PsychOpenGL/MOGL/source/')
try
- mex -v -g --output moglcore.mex -DLINUX -DGLEW_STATIC -DPTBOCTAVE3MEX -I/usr/X11R6/include -L/usr/X11R6/lib -lc -lGL -lGLU -lglut moglcore.c gl_auto.c gl_manual.c glew.c mogl_rebinder.c
+ mex -v -g --output moglcore.mex -DLINUX -DPTBOCTAVE3MEX -I/usr/X11R6/include -L/usr/X11R6/lib -lc -lGL -lGLU -lglut -lGLEW moglcore.c gl_auto.c gl_manual.c mogl_rebinder.c
catch
end
unix(['mv moglcore.mex ' PsychtoolboxRoot target]);
--- a/PsychSourceGL/Source/Common/Base/PsychIncludes.h
+++ b/PsychSourceGL/Source/Common/Base/PsychIncludes.h
@@ -40,7 +40,7 @@
// Platform independent include for glew: This is a catch-all
// for all OpenGL definitions and functions, currently up to
// OpenGL 2.1:
-#include "../Screen/glew.h"
+#include <GL/glew.h>
//platform dependent includes stage 1
#if PSYCH_SYSTEM == PSYCH_LINUX
@@ -55,7 +55,7 @@
#include <stdint.h>
// This is the new glew include for GLX extension support:
- #include "../Screen/glxew.h"
+ #include <GL/glxew.h>
#include <X11/Xlib.h>
#include <X11/keysym.h>
--- a/Psychtoolbox/PsychOpenGL/MOGL/source/mogltypes.h
+++ b/Psychtoolbox/PsychOpenGL/MOGL/source/mogltypes.h
@@ -31,7 +31,7 @@
/* glew.h is part of GLEW library for automatic detection and binding of
OpenGL core functionality and extensions.
*/
-#include "glew.h"
+#include <GL/glew.h>
/* Hack to take care of missing function prototypes in current glew.h */
#define glPointParameteri glPointParameteriNV
#define glPointParameteriv glPointParameterivNV
@@ -59,7 +59,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include "glxew.h"
+#include <GL/glxew.h>
#include <GL/gl.h>
#include <GL/glu.h>
#include <GL/glut.h>
--- a/Psychtoolbox/PsychOpenGL/MOGL/source/mogl_rebinder.c
+++ b/Psychtoolbox/PsychOpenGL/MOGL/source/mogl_rebinder.c
@@ -4,7 +4,7 @@
*
*/
-#include "glew.h"
+#include <GL/glew.h>
// Dynamic extension rebinding: This is in an extra file mogl_rebinder.c and defined
// with explicit C linkage. Reason: For the Octave version, we need to compile all
|
