Add GLES in build system

diff --git a/makefile b/makefile
index b62194cd42dc9a93e07649c33aec7b33817f054b..216bdca564564656755d7eee392317cbc88aaf3c 100644 (file)
--- a/makefile
+++ b/makefile
@@ -329,6 +329,11 @@ else ifeq ($(DP_LINK_XMP), dlopen)
        CFLAGS_SND_XMP=-DUSEXMP
 endif
 
+# GLES
+ifeq ($(DP_GLES),2)
+       LIB_GLES=-lGLESv2
+       CFLAGS_GLES=-DUSE_GLES2
+endif
 
 ##### Extra CFLAGS #####
 ifdef DP_FS_BASEDIR

diff --git a/makefile.inc b/makefile.inc
index 33cbc0438525ef568d77e9858a68673580f2f160..9a04cb99edd62e826d51217fca50c71ffddc1452 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -148,7 +148,7 @@ else
        CFLAGS_MAKEDEP?=-MMD
 endif
 
-CFLAGS_COMMON=$(CFLAGS_STANDARD) $(CFLAGS_TCC) $(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_WARNINGS) $(CFLAGS_LIBZ) $(CFLAGS_LIBJPEG) $(CFLAGS_SND_XMP) $(CFLAGS_NET) $(CFLAGS_SDL) -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES -I../../../
+CFLAGS_COMMON=$(CFLAGS_STANDARD) $(CFLAGS_TCC) $(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_WARNINGS) $(CFLAGS_LIBZ) $(CFLAGS_LIBJPEG) $(CFLAGS_SND_XMP) $(CFLAGS_NET) $(CFLAGS_SDL) $(CFLAGS_GLES) -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES -I../../../
 CFLAGS_CLIENT=-DCONFIG_MENU $(CFLAGS_VIDEO_CAPTURE)
 CFLAGS_SERVER=
 CFLAGS_DEBUG=-ggdb
@@ -207,7 +207,7 @@ LDFLAGS_UNIXSV_PRELOAD=-lz -ljpeg -lpng -lcurl
 LDFLAGS_UNIXSDL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl -lxmp
 CFLAGS_UNIX_PRELOAD=-DPREFER_PRELOAD
 
-LDFLAGS_UNIXSDL=$(SDL_LIBS) #-lGLESv2
+LDFLAGS_UNIXSDL=$(SDL_LIBS) $(LIB_GLES)
 EXE_UNIXSV=darkplaces-dedicated
 EXE_UNIXSDL=darkplaces-sdl
 EXE_UNIXSVNEXUIZ=nexuiz-dedicated