diff options
| author | Fathi Boudra <fabo@debian.org> | 2011-10-17 11:56:52 +0300 |
|---|---|---|
| committer | Fathi Boudra <fabo@debian.org> | 2011-10-17 11:56:52 +0300 |
| commit | 3b1bbda26b63fc06e239681bc3d0299b4a6c9dd1 (patch) | |
| tree | 66fc80b84e948431caebf5e5bc52d3875f79343f | |
| parent | 4a045fcd93b80671069eaddde3b4298ec9f9b646 (diff) | |
Switch back to GL ES1 as the code needs to be ported to GL ES2.
Fix build failures for GL ES1:
- link against libgGLESv1_CM
| -rw-r--r-- | Makefile | 10 | ||||
| -rwxr-xr-x | code/egl/GenerateQGL.pl | 2 | ||||
| -rw-r--r-- | code/egl/egl_glimp.c | 2 | ||||
| -rw-r--r-- | code/egl/egl_glimp.h | 2 | ||||
| -rw-r--r-- | code/egl/egl_input.c | 2 | ||||
| -rw-r--r-- | code/egl/egl_input.h | 2 | ||||
| -rw-r--r-- | code/renderer/qgl.h | 2 |
7 files changed, 11 insertions, 11 deletions
@@ -197,9 +197,9 @@ ifeq ($(SDL_CFLAGS),) endif endif -GLES2_LIBS=$(shell pkg-config --libs glesv2 egl) -ifeq ($(GLES2_LIBS),) - GLES2_LIBS=-lGLESv2 +GLES_LIBS=$(shell pkg-config --libs glesv1_cm egl) +ifeq ($(GLES_LIBS),) + GLES_LIBS=-lGLESv1_CM 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/GLES2/ - CLIENT_LIBS=$(SDL_LIBS) $(GLES2_LIBS) -lX11 + BASE_CFLAGS += -I/usr/include/EGL/ -I/usr/include/GLES/ + CLIENT_LIBS=$(SDL_LIBS) $(GLES_LIBS) -lX11 ifeq ($(USE_OPENAL),1) ifneq ($(USE_OPENAL_DLOPEN),1) diff --git a/code/egl/GenerateQGL.pl b/code/egl/GenerateQGL.pl index f60e495..6c1372b 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 <GLES2/gl2.h>\n";
+print INPUT_FILE "#import <GLES/gl.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 63f4b58..5032683 100644 --- a/code/egl/egl_glimp.c +++ b/code/egl/egl_glimp.c @@ -9,7 +9,7 @@ #include <X11/Xutil.h> #include <EGL/egl.h> -#include <GLES2/gl2.h> +#include <GLES/gl.h> #include "egl_glimp.h" #include "../client/client.h" diff --git a/code/egl/egl_glimp.h b/code/egl/egl_glimp.h index f965291..095428c 100644 --- a/code/egl/egl_glimp.h +++ b/code/egl/egl_glimp.h @@ -15,7 +15,7 @@ #include <X11/Xutil.h> #include <EGL/egl.h> -#include <GLES2/gl2.h> +#include <GLES/gl.h> #include "egl_input.h" diff --git a/code/egl/egl_input.c b/code/egl/egl_input.c index 9206580..9636560 100644 --- a/code/egl/egl_input.c +++ b/code/egl/egl_input.c @@ -12,7 +12,7 @@ #include <X11/Xutil.h> #include <EGL/egl.h> -#include <GLES2/gl2.h> +#include <GLES/gl.h> #include "egl_glimp.h" #include "../client/client.h" diff --git a/code/egl/egl_input.h b/code/egl/egl_input.h index 0fb4630..97f9ea2 100644 --- a/code/egl/egl_input.h +++ b/code/egl/egl_input.h @@ -15,7 +15,7 @@ #include <X11/Xutil.h> #include <EGL/egl.h> -#include <GLES2/gl2.h> +#include <GLES/gl.h> #include "../qcommon/q_shared.h" diff --git a/code/renderer/qgl.h b/code/renderer/qgl.h index 116f8dd..8da0fcd 100644 --- a/code/renderer/qgl.h +++ b/code/renderer/qgl.h @@ -48,7 +48,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #elif defined( __linux__ ) #include <EGL/egl.h> -#include <GLES2/gl2.h> +#include <GLES/gl.h> #include "../egl/egl_glimp.h" |