Add GLES2 files to Makefile and configure.ac (compile with --without-gles2 if you don't want to build it; it doesn't hurt anything though)

This commit is contained in:
Colby Klein
2012-12-09 03:01:08 -08:00
parent a6020c8b1d
commit 60cede24fe
2 changed files with 13 additions and 1 deletions
+6
View File
@@ -197,6 +197,12 @@ if test "$with_network" = "no"; then
fi fi
AM_CONDITIONAL(WITHOUT_NETWORKING, test "$with_network" = "no") AM_CONDITIONAL(WITHOUT_NETWORKING, test "$with_network" = "no")
AC_ARG_WITH(gles2, AS_HELP_STRING([--without-gles2],[Disable OpenGL ES 2.0]), with_network=$withval, with_network=yes)
if test "$with_gles2" = "no"; then
AC_DEFINE(WITHOUT_GLES2, 1, [OpenGL ES 2.0 support not available])
fi
AM_CONDITIONAL(WITHOUT_GLES2, test "$with_gles2" = "no")
SM_ZLIB SM_ZLIB
SM_BZIP SM_BZIP
SM_AUDIO SM_AUDIO
+7 -1
View File
@@ -414,7 +414,9 @@ RageFileDriverSlice.cpp RageFileDriverSlice.h \
RageFileDriverTimeout.cpp RageFileDriverTimeout.h RageFileDriverTimeout.cpp RageFileDriverTimeout.h
Rage = $(PCRE) $(Lua) $(jsoncpp) $(RageFile) $(RageSoundFileReaders) \ Rage = $(PCRE) $(Lua) $(jsoncpp) $(RageFile) $(RageSoundFileReaders) \
RageBitmapTexture.cpp RageBitmapTexture.h RageDisplay.cpp RageDisplay.h RageDisplay_OGL.cpp RageDisplay_OGL.h \ RageBitmapTexture.cpp RageBitmapTexture.h \
RageDisplay.cpp RageDisplay.h \
RageDisplay_OGL.cpp RageDisplay_OGL.h \
RageDisplay_OGL_Helpers.cpp RageDisplay_OGL_Helpers.h glext.h \ RageDisplay_OGL_Helpers.cpp RageDisplay_OGL_Helpers.h glext.h \
RageDisplay_Null.cpp RageDisplay_Null.h RageException.cpp RageException.h RageInput.cpp RageInput.h \ RageDisplay_Null.cpp RageDisplay_Null.h RageException.cpp RageException.h RageInput.cpp RageInput.h \
RageInputDevice.cpp RageInputDevice.h RageLog.cpp RageLog.h RageMath.cpp RageMath.h \ RageInputDevice.cpp RageInputDevice.h RageLog.cpp RageLog.h RageMath.cpp RageMath.h \
@@ -622,6 +624,10 @@ main_SOURCES = $(PNG) \
$(Actors) \ $(Actors) \
$(GlobalSingletons) $(GlobalSingletons)
if !WITHOUT_GLES2
main_SOURCES += RageDisplay_GLES2.cpp RageDisplay_GLES2.h
endif
main_LDADD = \ main_LDADD = \
$(VIDEO_LIBS) \ $(VIDEO_LIBS) \
$(AUDIO_LIBS) \ $(AUDIO_LIBS) \