change some configuratuion

This commit is contained in:
Edouard Dupin 2012-09-09 23:41:36 +02:00
parent e610df1f12
commit cdfe6ef57b
4 changed files with 12 additions and 12 deletions

2
Build

@ -1 +1 @@
Subproject commit 76f4cb14af0167fcc7e250603b62660e164644c7
Subproject commit 117590abe8fc0de1153051be6e232295dc7445fa

View File

@ -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

View File

@ -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

View File

@ -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)