diff options
| author | Fathi Boudra <fabo@debian.org> | 2011-10-17 11:10:40 +0300 |
|---|---|---|
| committer | Fathi Boudra <fabo@debian.org> | 2011-10-17 11:10:40 +0300 |
| commit | 4a045fcd93b80671069eaddde3b4298ec9f9b646 (patch) | |
| tree | b1de7a2c02229f370d72283693a4f94a1e9a990e | |
| parent | 69de9fbf97b8451b6f170a780091370d10f1896b (diff) | |
Use GL ES2:
- fix headers
- link against libGLESv2
| -rw-r--r-- | Makefile | 10 | ||||
| -rwxr-xr-x | code/egl/GenerateQGL.pl | 2 | ||||
| -rw-r--r-- | code/egl/egl_glimp.c | 4 | ||||
| -rw-r--r-- | code/egl/egl_glimp.h | 4 | ||||
| -rw-r--r-- | code/egl/egl_input.c | 4 | ||||
| -rw-r--r-- | code/egl/egl_input.h | 4 | ||||
| -rw-r--r-- | code/renderer/qgl.h | 4 |
7 files changed, 16 insertions, 16 deletions
@@ -197,9 +197,9 @@ ifeq ($(SDL_CFLAGS),) endif endif -GLES_LIBS=$(shell pkg-config --libs glesv1_cm egl) -ifeq ($(GLES_LIBS),) - GLES_LIBS=-lGLES_CM +GLES2_LIBS=$(shell pkg-config --libs glesv2 egl) +ifeq ($(GLES2_LIBS),) + GLES2_LIBS=-lGLESv2 endif # version info @@ -317,8 +317,8 @@ ifeq ($(PLATFORM),linux) THREAD_LIBS=-lpthread LIBS=-ldl -lm - BASE_CFLAGS += -I/usr/include/EGL/ -I/usr/include/GLES/ - CLIENT_LIBS=$(SDL_LIBS) $(GLES_LIBS) -lX11 + BASE_CFLAGS += -I/usr/include/EGL/ -I/usr/include/GLES2/ + CLIENT_LIBS=$(SDL_LIBS) $(GLES2_LIBS) -lX11 ifeq ($(USE_OPENAL),1) ifneq ($(USE_OPENAL_DLOPEN),1) diff --git a/code/egl/GenerateQGL.pl b/code/egl/GenerateQGL.pl index 6c1372b..f60e495 100755 --- a/code/egl/GenerateQGL.pl +++ b/code/egl/GenerateQGL.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl
open(INPUT_FILE, ">/tmp/input-$$.h") || die "$!";
-print INPUT_FILE "#import <GLES/gl.h>\n";
+print INPUT_FILE "#import <GLES2/gl2.h>\n";
close INPUT_FILE;
open(CPP, "/usr/bin/cpp /tmp/input-$$.h|") || die "$!";
diff --git a/code/egl/egl_glimp.c b/code/egl/egl_glimp.c index 4783e89..63f4b58 100644 --- a/code/egl/egl_glimp.c +++ b/code/egl/egl_glimp.c @@ -8,8 +8,8 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> -#include <GLES/egl.h> -#include <GLES/gl.h> +#include <EGL/egl.h> +#include <GLES2/gl2.h> #include "egl_glimp.h" #include "../client/client.h" diff --git a/code/egl/egl_glimp.h b/code/egl/egl_glimp.h index 0febcb2..f965291 100644 --- a/code/egl/egl_glimp.h +++ b/code/egl/egl_glimp.h @@ -14,8 +14,8 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> -#include <GLES/egl.h> -#include <GLES/gl.h> +#include <EGL/egl.h> +#include <GLES2/gl2.h> #include "egl_input.h" diff --git a/code/egl/egl_input.c b/code/egl/egl_input.c index 961af2a..9206580 100644 --- a/code/egl/egl_input.c +++ b/code/egl/egl_input.c @@ -11,8 +11,8 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> -#include <GLES/egl.h> -#include <GLES/gl.h> +#include <EGL/egl.h> +#include <GLES2/gl2.h> #include "egl_glimp.h" #include "../client/client.h" diff --git a/code/egl/egl_input.h b/code/egl/egl_input.h index e749732..0fb4630 100644 --- a/code/egl/egl_input.h +++ b/code/egl/egl_input.h @@ -14,8 +14,8 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> -#include <GLES/egl.h> -#include <GLES/gl.h> +#include <EGL/egl.h> +#include <GLES2/gl2.h> #include "../qcommon/q_shared.h" diff --git a/code/renderer/qgl.h b/code/renderer/qgl.h index ced454c..116f8dd 100644 --- a/code/renderer/qgl.h +++ b/code/renderer/qgl.h @@ -47,8 +47,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #elif defined( __linux__ ) -#include <GLES/egl.h> -#include <GLES/gl.h> +#include <EGL/egl.h> +#include <GLES2/gl2.h> #include "../egl/egl_glimp.h" |