atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change some configuratuion

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Build

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

14
Sources/libewol/Android.mk
View File

@ -23,13 +23,13 @@ LOCAL_CFLAGS := -Wno-write-strings \
-DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\"" \ -DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\"" \
-DDATA_IN_APK -DDATA_IN_APK
ifeq ("$(SHADER)","1") #ifeq ("$(CONFIG__VIDEO__OPENGL_ES_2)","y")
LOCAL_CFLAGS += -D__VIDEO__OPENGL_ES_2 LOCAL_CFLAGS += -D__VIDEO__OPENGL_ES_2
LOCAL_EXPORT_CFLAGS := -D__VIDEO__OPENGL_ES_2 LOCAL_EXPORT_CFLAGS := -D__VIDEO__OPENGL_ES_2
LOCAL_EXPORT_LDLIBS := -lGLESv2 LOCAL_EXPORT_LDLIBS := -lGLESv2
else #else
LOCAL_EXPORT_LDLIBS := -lGLESv1_CM # LOCAL_EXPORT_LDLIBS := -lGLESv1_CM
endif #endif
LOCAL_EXPORT_LDLIBS += -ldl -llog LOCAL_EXPORT_LDLIBS += -ldl -llog

6
Sources/libewol/Config.in
View File

@ -1,14 +1,14 @@
menu "General" menu "General"
choice choice
prompt "OpenGl mode" prompt "OpenGl mode"
default EWOL_OPENGL_ES_V1 default __VIDEO__OPENGL_ES_1
help help
OpenGL mode possible : OpenGL mode possible :
0 : openGL basic mode, vertex buffer. 0 : openGL basic mode, vertex buffer.
1 : OpenGl 2 ==> no vertex bufffer but enable Shader system 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" bool "0: openGl ES 1.0"
config EWOL_OPENGL_ES_V2 config __VIDEO__OPENGL_ES_2
bool "1: openGl ES 2.0" bool "1: openGl ES 2.0"
endchoice endchoice
endmenu endmenu

2
Sources/libewol/Linux.mk
View File

@ -28,7 +28,7 @@ LOCAL_CFLAGS := -Wno-write-strings \
-DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\"" \ -DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\"" \
-Wall -Wall
#ifdef CONFIG_EWOL_OPENGL_ES_V2 #ifneq ("$(CONFIG__VIDEO__OPENGL_ES_2)","")
LOCAL_CFLAGS += -D__VIDEO__OPENGL_ES_2 LOCAL_CFLAGS += -D__VIDEO__OPENGL_ES_2
LOCAL_EXPORT_CFLAGS := -D__VIDEO__OPENGL_ES_2 LOCAL_EXPORT_CFLAGS := -D__VIDEO__OPENGL_ES_2
$(info Compilation For openGL-ES-v2 compatibility) $(info Compilation For openGL-ES-v2 compatibility)