diff --git a/Build b/Build index 76f4cb14..117590ab 160000 --- a/Build +++ b/Build @@ -1 +1 @@ -Subproject commit 76f4cb14af0167fcc7e250603b62660e164644c7 +Subproject commit 117590abe8fc0de1153051be6e232295dc7445fa diff --git a/Sources/libewol/Android.mk b/Sources/libewol/Android.mk index b191f0d6..774e3f8b 100644 --- a/Sources/libewol/Android.mk +++ b/Sources/libewol/Android.mk @@ -23,13 +23,13 @@ LOCAL_CFLAGS := -Wno-write-strings \ -DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\"" \ -DDATA_IN_APK -ifeq ("$(SHADER)","1") - LOCAL_CFLAGS += -D__VIDEO__OPENGL_ES_2 - LOCAL_EXPORT_CFLAGS := -D__VIDEO__OPENGL_ES_2 - LOCAL_EXPORT_LDLIBS := -lGLESv2 -else - LOCAL_EXPORT_LDLIBS := -lGLESv1_CM -endif +#ifeq ("$(CONFIG__VIDEO__OPENGL_ES_2)","y") +LOCAL_CFLAGS += -D__VIDEO__OPENGL_ES_2 +LOCAL_EXPORT_CFLAGS := -D__VIDEO__OPENGL_ES_2 +LOCAL_EXPORT_LDLIBS := -lGLESv2 +#else +# LOCAL_EXPORT_LDLIBS := -lGLESv1_CM +#endif LOCAL_EXPORT_LDLIBS += -ldl -llog diff --git a/Sources/libewol/Config.in b/Sources/libewol/Config.in index 0ccc616a..33fe6a56 100644 --- a/Sources/libewol/Config.in +++ b/Sources/libewol/Config.in @@ -1,14 +1,14 @@ menu "General" choice prompt "OpenGl mode" - default EWOL_OPENGL_ES_V1 + default __VIDEO__OPENGL_ES_1 help OpenGL mode possible : 0 : openGL basic mode, vertex buffer. 1 : OpenGl 2 ==> no vertex bufffer but enable Shader system - config EWOL_OPENGL_ES_V1 + config __VIDEO__OPENGL_ES_1 bool "0: openGl ES 1.0" - config EWOL_OPENGL_ES_V2 + config __VIDEO__OPENGL_ES_2 bool "1: openGl ES 2.0" endchoice endmenu diff --git a/Sources/libewol/Linux.mk b/Sources/libewol/Linux.mk index 510b1e81..b349379d 100644 --- a/Sources/libewol/Linux.mk +++ b/Sources/libewol/Linux.mk @@ -28,7 +28,7 @@ LOCAL_CFLAGS := -Wno-write-strings \ -DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\"" \ -Wall -#ifdef CONFIG_EWOL_OPENGL_ES_V2 +#ifneq ("$(CONFIG__VIDEO__OPENGL_ES_2)","") LOCAL_CFLAGS += -D__VIDEO__OPENGL_ES_2 LOCAL_EXPORT_CFLAGS := -D__VIDEO__OPENGL_ES_2 $(info Compilation For openGL-ES-v2 compatibility)