Rework the ewol architecture for common building tool

Build/Makefile.Android.mk

@@ -24,14 +24,14 @@ all:
 	@mkdir -p $(JAVA_FOLDER)/
 	
 	@echo $(F_ROUGE)"
          (sh) copy the java File : "$(F_NORMALE)
-	@cp $(EWOL_FOLDER)/SourcesJava/PROJECT_NAME.java $(JAVA_FOLDER)/$(PROJECT_NAME).java
+	@cp $(EWOL_FOLDER)/Java/PROJECT_NAME.java $(JAVA_FOLDER)/$(PROJECT_NAME).java
 	@echo $(F_ROUGE)"
          (sh) Replace __PROJECT_VENDOR__, __PROJECT_NAME__ and __PROJECT_PACKAGE__ with the correct intance "$(F_NORMALE)
 	@sed -i "s|__PROJECT_VENDOR__|$(PROJECT_VENDOR)|" $(JAVA_FOLDER)/$(PROJECT_NAME).java
 	@sed -i "s|__PROJECT_NAME__|$(PROJECT_NAME)|" $(JAVA_FOLDER)/$(PROJECT_NAME).java
 	@sed -i "s|__PROJECT_PACKAGE__|$(PROJECT_PACKAGE)|" $(JAVA_FOLDER)/$(PROJECT_NAME).java
 	
 	@echo $(F_ROUGE)"
          (sh) copy the cpp for jni File : $(EWOL_FOLDER)/SourcesJava/ewolAndroidAbstraction.cpp"$(F_NORMALE)
-	@cp $(EWOL_FOLDER)/SourcesJava/ewolAndroidAbstraction.cpp jni/
+	@cp $(EWOL_FOLDER)/Java/ewolAndroidAbstraction.cpp jni/
 	@echo $(F_ROUGE)"
          (sh) Replace __PROJECT_VENDOR__, __PROJECT_NAME__ and __PROJECT_PACKAGE__ with the correct intance "$(F_NORMALE)
 	@sed -i "s|__PROJECT_VENDOR__|$(PROJECT_VENDOR)|" jni/ewolAndroidAbstraction.cpp
 	@sed -i "s|__PROJECT_NAME__|$(PROJECT_NAME)|" jni/ewolAndroidAbstraction.cpp

Makefile

@@ -1,289 +0,0 @@
-##################################################################################################################
-#                                                                                                                #
-#   Fichier     :   Makefile                                                                                     #
-#                                                                                                                #
-#   Type        :   Makefile d'un programme complet                                                              #
-#                                                                                                                #
-#   Auteur      :   Heero Yui                                                                                    #
-#                                                                                                                #
-#   Evolutions  :   Date          Auteur        Raison                                                           #
-#                2010-01-29      Heero Yui      Mise en place d'un makefile ultra simple                         #
-#                2011-07-14      Heero Yui      Rework the current dorder includion (simplification)             #
-#                                                                                                                #
-#   Notes       :   This makefile might be edited with an editor compatible with escape char and carrer return   #
-#                   char                                                                                         #
-#                                                                                                                #
-# Concu Pour le projet ewol                                                                                      #
-#                                                                                                                #
-##################################################################################################################
-export F_GRAS=
-export F_INVERSER=
-export F_SOUSLIGNER=
-export F_NORMALE=
-export F_NOIR=
-export F_ROUGE=
-export F_VERT=
-export F_MARRON=
-export F_BLUE=
-export F_VIOLET=
-export F_CYAN=
-export F_GRIS=
-export CADRE_HAUT_BAS='	$(F_INVERSER)                                                                    $(F_NORMALE)'
-export CADRE_COTERS='
	$(F_INVERSER)  $(F_NORMALE)								  $(F_INVERSER)  $(F_NORMALE)'
-
-VERSION_TAG=$(shell git describe --tags)
-#$(info $(VERSION_TAG))
-
-VERSION_TAG_SHORT=$(shell git describe --tags --abbrev=0)
-#$(info $(VERSION_TAG_SHORT))
-
-VERSION_BUILD_TIME=$(shell date)
-#$(info $(VERSION_BUILD_TIME))
-
-PLATFORM?=Linux
-CXXFILES += base/guiX11.cpp
-
-###############################################################################
-### Compilateur base system                                                 ###
-###############################################################################
-CXX=g++
-CC=gcc
-AR=ar
-
-DEBUG:=1
-
-###############################################################################
-### Compilation Define                                                      ###
-###############################################################################
-ifeq ("$(DEBUG)", "0")
-    DEFINE = -DETK_DEBUG_LEVEL=1
-    DEFINE+= -DEWOL_DEBUG_LEVEL=1
-    DEFINE+= -DNDEBUG
-    DEFINE+= -DEWOL_VERSION_TAG_NAME="\"$(VERSION_TAG)-release\""
-else
-    DEFINE = -DETK_DEBUG_LEVEL=3
-    DEFINE+= -DEWOL_DEBUG_LEVEL=3
-    DEFINE+= -DEWOL_VERSION_TAG_NAME="\"$(VERSION_TAG)-debug\""
-endif
-DEFINE+= -DVERSION_BUILD_TIME="\"$(VERSION_BUILD_TIME)\""
-
-X11FLAGS= -lGL -lGLU
-# some X11 mode availlable : 
-# install package : libxxf86vm-dev
-X11FLAGS+= -lX11 -DEWOL_X11_MODE__XF86V -lXxf86vm
-# install package : libxrender-dev 
-#X11FLAGS+= -lX11 -DEWOL_X11_MODE__XRENDER -lXrandr
-
-
-ifeq ($(shell if `pkg-config --exists freetype2` ; then echo "yes"; else echo "no"; fi), yes)
-    FREETYPE_CFLAGS=  `pkg-config --cflags freetype2` -DEWOL_USE_FREE_TYPE
-    FREETYPE_LDFLAGS= `pkg-config --libs freetype2` -DEWOL_USE_FREE_TYPE
-else
-    FREETYPE_CFLAGS=
-    FREETYPE_LDFLAGS=
-    $(Info  libFreeType-dev is not installed)
-endif
-
-
-###############################################################################
-### Android Area                                                            ###
-###############################################################################
-ifeq ($(PLATFORM), Android)
-    PROJECT_NDK=$(realpath ../android/ndk-r7/)
-    PROJECT_SDK=$(realpath ../android/sdk-r15/)
-endif
-
-
-###############################################################################
-### Basic C flags                                                           ###
-###############################################################################
-
-# basic X11 librairy ==> show if we can une under lib ...
-CXXFLAGS=  $(X11FLAGS) $(FREETYPE_CFLAGS) -D__PLATFORM__$(PLATFORM)
-
-ifeq ("$(DEBUG)", "0")
-	CXXFLAGS+= -O2
-else
-	# Enable debug (cgdb ***)
-	CXXFLAGS+= -g -O0
-endif
-# display all flags
-CXXFLAGS+= -Wall
-# ...
-CXXFLAGS+= -D_REENTRANT
-# internal defines
-CXXFLAGS+= $(DEFINE)
-# remove warning from the convertion char*
-CXXFLAGS+= -Wno-write-strings
-
-CFLAGS=    $(CXXFLAGS) -std=c99
-
-# basic extern librairy
-LDFLAGS=  $(X11FLAGS) $(FREETYPE_LDFLAGS)
-
-# Dynamic connection of the CALLBACK of the GUI
-LDFLAGS+= -Wl,--export-dynamic
-
-###############################################################################
-### Project Name                                                            ###
-###############################################################################
-PROG_NAME=ewol
-
-###############################################################################
-### Basic Project description Files                                         ###
-###############################################################################
-FILE_DIRECTORY=Sources
-OUTPUT_NAME_RELEASE=$(PROG_NAME)_release
-OUTPUT_NAME_DEBUG=$(PROG_NAME)_debug
-OBJECT_DIR=Object_$(PLATFORM)
-
-ifeq ("$(DEBUG)", "0")
-    OBJECT_DIRECTORY=$(OBJECT_DIR)/release
-    OUTPUT_NAME = $(OUTPUT_NAME_RELEASE)
-else
-    OBJECT_DIRECTORY=$(OBJECT_DIR)/debug
-    OUTPUT_NAME = $(OUTPUT_NAME_DEBUG)
-endif
-
-
-
-###############################################################################
-### Generique dependency                                                    ###
-###############################################################################
-MAKE_DEPENDENCE=Makefile
-
-###############################################################################
-### Files Listes                                                            ###
-###############################################################################
-
-#data File of the program :
-ifeq ($(DATA_MODE), MEMORY)
-CXXFILES +=		GeneratedData.cpp
-endif
-
-
-# tiny XML (extern OPEN Sources) :
-CXXFILES +=		tinyXML/tinyxml.cpp \
-				tinyXML/tinyxmlparser.cpp \
-				tinyXML/tinyxmlerror.cpp \
-				tinyXML/tinystr.cpp
-
-# Ewol Tool Kit :
-CXXFILES +=		etk/Debug.cpp \
-				etk/DebugInternal.cpp \
-				etk/Memory.cpp \
-				etk/String.cpp \
-				etk/Stream.cpp \
-				etk/File.cpp \
-				etk/RegExp.cpp
-
-# Ewol Sources :
-CXXFILES +=		ewol/ewol.cpp \
-				ewol/Debug.cpp \
-				ewol/OObject.cpp \
-				ewol/OObject/2DText.cpp \
-				ewol/OObject/2DColored.cpp \
-				ewol/OObject/2DTextured.cpp \
-				ewol/Texture.cpp
-ifeq ("$(FREETYPE_CFLAGS)", "")
-    CXXFILES +=	ewol/FontBitmap.cpp
-else
-    CXXFILES +=	ewol/FontFreeType.cpp
-endif
-CXXFILES +=		ewol/Widget.cpp \
-				ewol/WidgetManager.cpp \
-				ewol/Windows.cpp
-# list of widgets :
-CXXFILES +=		ewol/widget/Button.cpp \
-				ewol/widget/CheckBox.cpp \
-				ewol/widget/Entry.cpp \
-				ewol/widget/List.cpp \
-				ewol/widget/SizerHori.cpp \
-				ewol/widget/SizerVert.cpp
-# only to test  son internal element ...
-CXXFILES +=		ewol/widget/Test.cpp
-# theme management :
-CXXFILES +=		ewol/themeManager.cpp \
-				ewol/theme/Theme.cpp \
-				ewol/theme/EolElement.cpp \
-				ewol/theme/EolElementFrame.cpp \
-				ewol/theme/EolColor.cpp \
-				ewol/theme/EolBase.cpp \
-				ewol/theme/EolBaseCircle.cpp \
-				ewol/theme/EolBaseCirclePart.cpp \
-				ewol/theme/EolBaseLine.cpp \
-				ewol/theme/EolBasePolygone.cpp \
-				ewol/theme/EolBaseRect.cpp \
-				ewol/theme/EolBaseTriangle.cpp
-
-
-
-# get all data file in the specific folder
-DATA_FOLDER=dataTest
-DATA_FILE=$(shell find $(DATA_FOLDER)/*)
-
-###############################################################################
-### Liste of folder where .h can be                                         ###
-###############################################################################
-LISTE_MODULES = $(sort $(dir $(CXXFILES)))
-#$(info listeModule=$(LISTE_MODULES))
-INCLUDE_DIRECTORY = $(addprefix -I$(FILE_DIRECTORY)/, $(LISTE_MODULES)) 
-# overwrite if needed the directory folder : 
-INCLUDE_DIRECTORY = -I$(FILE_DIRECTORY)/
-
-###############################################################################
-### Build Object Files List                                                 ###
-###############################################################################
-OBJ =	$(addprefix $(OBJECT_DIRECTORY)/, $(CXXFILES:.cpp=.o))
-
-
-
-###############################################################################
-### Main Part of Makefile                                                   ###
-###############################################################################
-all: build
-
--include $(OBJ:.o=.d)
-
-build : .encadrer .versionFile $(OBJ) $(MAKE_DEPENDENCE)
-	@echo $(F_ROUGE)"
          (.a) lib$(PROG_NAME).a "$(F_NORMALE)
-	@ar rcs lib$(PROG_NAME).a $(OBJ)
-
-
-.encadrer:
-	@echo $(CADRE_HAUT_BAS)
-	@echo $(CADRE_COTERS)
-	@echo '
           DEBUT DE COMPILATION DU PROGRAMME :'$(CADRE_COTERS)
-	@echo '
             Repertoire Sources : $(FILE_DIRECTORY)/'$(CADRE_COTERS)
-	@echo '
             Repertoire object  : $(OBJECT_DIRECTORY)/'$(CADRE_COTERS)
-	@echo '
             Binaire de sortie  : $(F_VIOLET)$(OUTPUT_NAME) $(F_NORMALE)'$(CADRE_COTERS)
-	@echo $(CADRE_COTERS)
-	@echo $(CADRE_HAUT_BAS)
-	@mkdir -p $(addprefix $(OBJECT_DIRECTORY)/, $(LISTE_MODULES))
-
-.versionFile:
-	@rm -f $(OBJECT_DIRECTORY)/ewol/ewol.o
-
-# build C++
-$(OBJECT_DIRECTORY)/%.o: $(FILE_DIRECTORY)/%.cpp $(MAKE_DEPENDENCE)
-	@echo $(F_VERT)"
          (.o)  $<"$(F_NORMALE)
-	@$(CXX)  $< -c -o $@  $(INCLUDE_DIRECTORY) $(CXXFLAGS) -MMD
-
-
-clean:
-	@echo $(CADRE_HAUT_BAS)
-	@echo '           CLEANING : $(F_VIOLET)$(OUTPUT_NAME)$(F_NORMALE)'$(CADRE_COTERS)
-	@echo $(CADRE_HAUT_BAS)
-	@echo $(F_VERT)"
          (rm)  $(OBJECT_DIR)"$(F_NORMALE)
-	@rm -rf $(OBJECT_DIR) 
-	@echo $(F_VERT)"
          (rm)  $(PROJECT_NAME) $(OUTPUT_NAME_DEBUG) $(OUTPUT_NAME_RELEASE)"$(F_NORMALE)
-	@rm -f $(PROG_NAME) $(OUTPUT_NAME_DEBUG) $(OUTPUT_NAME_RELEASE)
-	@echo $(F_VERT)"
          (rm)  doxygen/*"$(F_NORMALE)
-	@rm -rf doxygen
-	@rm -f doxygen.log
-	@echo $(F_VERT)"
          (rm)  *.bck"$(F_NORMALE)
-	@rm -f `find . -name "*.bck"`
-
-
-count:
-	wc -l Makefile `find $(FILE_DIRECTORY)/ -name "*.cpp"` `find $(FILE_DIRECTORY)/ -name "*.h"` 

Sources/ewol/Android.mk

@@ -1,35 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := ewol
-LOCAL_STATIC_LIBRARIES := libzip libpng
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Sources $(LOCAL_PATH)/../libzip/ $(LOCAL_PATH)/../libpng/
-
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../Sources
-LOCAL_EXPORT_LDLIBS := -lGLESv1_CM -ldl -llog -lz
-
-LOCAL_CFLAGS := -D__PLATFORM__Android \
-                -Wno-write-strings \
-                -DETK_DEBUG_LEVEL=3 \
-                -DEWOL_DEBUG_LEVEL=3 \
-                -DEWOL_VERSION_TAG_NAME="\"UNKNOW-debug\"" \
-                -DVERSION_BUILD_TIME="\"pasd_heure\"" \
-                -DDATA_IN_APK \
-
-# load the common sources file of the platform
-include $(LOCAL_PATH)/file.mk
-
-LOCAL_SRC_FILES := \
-	../../Sources/base/guiAndroid.cpp \
-	$(addprefix ../../Sources/, $(FILE_LIST))
-
-#for freetype : https://github.com/cdave1/freetype2-android
-
-# Ewol Test Software :
-LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog -lz
-
-include $(BUILD_STATIC_LIBRARY)
-
-

dataTest/TextMonospace.ebt

@@ -1,132 +0,0 @@
-name:Monospace
-normal:TextMonospace.bmp
-bold:TextMonospaceBold.bmp
-bold-italic:TextMonospaceBoldItalic.bmp
-italic:TextMonospaceItalic.bmp
-# comment line ...
-# size 54 largeur 33 space between letter 12
-# unknow UTF8 code of the letter and start coordonate and size ==> 0x54 (33,45) (33,54)
-0x00 (99,453) (33,54) # Error : Unknow the UTF8 element ...
-# hexa UTF8 code of the letter and start coordonate and size ==> 0x54 (33,45) (33,54)
-# ABCDEFGHIJKLMN
-0x20 (0,7) (33,54) # space ...
-0x41 (33,7) (33,54) # A
-0x42 (66,7) (33,54) # B
-0x43 (99,7) (33,54) # C
-0x44 (132,7) (33,54) # D
-0x45 (165,7) (33,54) # E
-0x46 (198,7) (33,54) # F
-0x47 (231,7) (33,54) # G
-0x48 (264,7) (33,54) # H
-0x49 (297,7) (33,54) # I
-0x4A (330,7) (33,54) # J
-0x4B (363,7) (33,54) # K
-0x4C (396,7) (33,54) # L
-0x4D (429,7) (33,54) # M
-0x4E (462,7) (33,54) # N
-#OPQRSTUVWXYZabc
-0x4F (0,71) (33,54) # O
-0x50 (33,71) (33,54) # P
-0x51 (66,71) (33,54) # Q
-0x52 (99,71) (33,54) # R
-0x53 (132,71) (33,54) # S
-0x54 (165,71) (33,54) # T
-0x55 (198,71) (33,54) # U
-0x56 (231,71) (33,54) # V
-0x57 (264,71) (33,54) # W
-0x58 (297,71) (33,54) # X
-0x59 (330,71) (33,54) # Y
-0x5A (363,71) (33,54) # Z
-0x61 (396,71) (33,54) # a
-0x62 (429,71) (33,54) # b
-0x63 (462,71) (33,54) # c
-#defghijklmnopqr
-0x64 (0,135) (33,54) # d
-0x65 (33,135) (33,54) # e
-0x66 (66,135) (33,54) # f
-0x67 (99,135) (33,54) # g
-0x68 (132,135) (33,54) # h
-0x69 (165,135) (33,54) # i
-0x6A (198,135) (33,54) # j
-0x6B (231,135) (33,54) # k
-0x6C (264,135) (33,54) # l
-0x6D (297,135) (33,54) # m
-0x6E (330,135) (33,54) # n
-0x6F (363,135) (33,54) # o
-0x70 (396,135) (33,54) # p
-0x71 (429,135) (33,54) # q
-0x72 (462,135) (33,54) # r
-#stuvwxyz1234567
-0x73 (0,199) (33,54) # s
-0x74 (33,199) (33,54) # t
-0x75 (66,199) (33,54) # u
-0x76 (99,199) (33,54) # v
-0x77 (132,199) (33,54) # w
-0x78 (165,199) (33,54) # x
-0x79 (198,199) (33,54) # y
-0x7A (231,199) (33,54) # z
-0x31 (264,199) (33,54) # 1
-0x32 (297,199) (33,54) # 2
-0x33 (330,199) (33,54) # 3
-0x34 (363,199) (33,54) # 4
-0x35 (396,199) (33,54) # 5
-0x36 (429,199) (33,54) # 6
-0x37 (462,199) (33,54) # 7
-#890&é~"#'{([-|è
-0x38 (0,263) (33,54) # 8
-0x39 (33,263) (33,54) # 9
-0x30 (66,263) (33,54) # 0
-0x26 (99,263) (33,54) # &
-#0x (132,263) (33,54) # é
-0x7E (165,263) (33,54) # ~
-0x22 (198,263) (33,54) # "
-0x23 (231,263) (33,54) # #
-0x27 (264,263) (33,54) # '
-0x7B (297,263) (33,54) # {
-0x28 (330,263) (33,54) # (
-0x5B (363,263) (33,54) # [
-0x2D (396,263) (33,54) # -
-0x7C (429,263) (33,54) # |
-#0x (462,263) (33,54) # è
-#`_\ç^à@)]=}
-0x60 (0,335) (33,54) # `
-0x5F (33,335) (33,54) # _
-0x5C (66,335) (33,54) # \
-#0x (99,335) (33,54) # ç
-0x5E (132,335) (33,54) # ^
-#0x (165,335) (33,54) # à
-0x40 (198,335) (33,54) # @
-0x29 (231,335) (33,54) # )
-0x5D (264,335) (33,54) # ]
-0x3D (297,335) (33,54) # =
-0x7D (330,335) (33,54) # }
-#0x (363,335) (33,54) # o chap
-#0x (396,335) (33,54) # u chap
-#0x (429,335) (33,54) # e chap
-#0x (462,335) (33,54) # a chap
-#$£*µ%!§:/
-#0x (0,391) (33,54) # i chap
-#0x (33,391) (33,54) # o trema
-#0x (66,391) (33,54) # u trema
-#0x (99,391) (33,54) # e trema
-#0x (132,391) (33,54) # a trema
-0x24 (165,391) (33,54) # $
-#0x (198,391) (33,54) # £
-0x2A (231,391) (33,54) # *
-#0x (264,391) (33,54) # µ
-#0x (297,391) (33,54) # ù
-0x25 (330,391) (33,54) # %
-0x21 (363,391) (33,54) # !
-#0x (396,391) (33,54) # §
-0x3A (429,391) (33,54) # :
-0x2F (462,391) (33,54) # /
-#;.,?<>²!+
-0x3B (0,453) (33,54) # ;
-0x2E (33,453) (33,54) # .
-0x2C (66,453) (33,54) # ,
-0x3F (99,453) (33,54) # ?
-0x3C (132,453) (33,54) # <
-0x3E (165,453) (33,54) # >
-#0x (198,453) (33,54) # ²
-#0x21 (231,453) (33,54) # ! ==> doublon ...
-0x2B (264,453) (33,54) # +

dataTest/exemple.eol

@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eol>
-	<!-- can have "color" and "group" that is consider as global ... -->
-	<color/>
-	<color name="MEGAMERDIQUE"/>
-	<color name="GenBG"			val="#FF0000"/>
-	<color name="GenFG"			val="#FF000055"/>
-	<color name="TestPlop"			val="#0000FF55"/>
-	<color name="GenBorder"		val="1.0;0.000512;1.0;0.755562535"/>
-	<color name="GenBorder"		val="5.0;0.000512;1.0"/>
-	
-	<group name="Gen Rect system ... ">
-		<rect color="..."
-		      position="0.53;0.56"
-		      size="0.22;0.11"
-		/>
-		<line color="..."
-		      positionStart="0.53;0.56"
-		      positionStop="0.22;0.11"
-		      thickness="0.05"
-		/>
-		<!-- and more basic display -->
-	</group>
-	
-	<!-- example of a single element -->
-	<element name="plop"
-	         ratio="1.0"
-	         ClipX="false"
-	         ClipY="false"
-	         internalElemStart="0.25;0.75"
-	         internalElemStop="0.75;0.75">
-		<!--
-			note we have 5 methode to reference a color : 
-				- #RRGGBB          ==> in hexa 0x00<=x<=0xFF
-				- #RRGGBBAA        ==> in hexa 0x00<=x<=0xFF
-				- R.R;G.G;B.B      ==> in double 0<=x<=1
-				- R.R;G.G;B.B;A.A  ==> in double 0<=x<=1
-				- &NameColor       ==> search internal color of the element and after global color ...
-		-->
-		<color name="Background"		val="#EEEEEEFF"/>
-		<color name="Red"				val="#FF0000FF"/>
-		<color name="Green"				val="#00FF00FF"/>
-		<color name="Border"			val="0.0;0.000512;1.0;0.755562535"/>
-		<!--...-->
-		
-		
-		<group name="basicRect">
-			<rect color="..."
-			      position="0.53;0.56"
-			      size="0.22;0.11"
-			/>
-			<line color="..."
-			      positionStart="0.53;0.56"
-			      positionStop="0.22;0.11"
-			      thickness="0.05"
-			/>
-			<!-- and more basic display -->
-		</group>
-		<!--...-->
-		
-		<frame id="0" name="basic">
-			<rect colorBG="Background"
-			      position="0.0;0.0"
-			      size="1.0;1.0"
-			/>
-			<rect colorBorder="Red"
-			      position="0.1;0.1"
-			      size="0.25;0.25"
-			      thickness="0.01"
-			/>
-			<line color="TestPlop"
-			      positionStart="0.53;0.56"
-			      positionStop="0.22;0.11"
-			      thickness="0.01"
-			/>
-			<circle colorBG="Green"
-			        position="0.75;0.75"
-			        radius="0.25"
-			/>
-		</frame>
-		<frame id="0" name="hover">
-			<rect color="..."
-			      position="0.53;0.56"
-			      size="0.22;0.11"
-			/>
-			<link name="basicRect"/>
-		</frame>
-		<!--...-->
-		
-	</element>
-	<!--...-->
-</eol>

jni/libetk/Android.mk

@@ -0,0 +1,29 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := etk
+LOCAL_STATIC_LIBRARIES := 
+
+LOCAL_C_INCLUDES := 
+
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_CFLAGS := -D__PLATFORM__Android \
+                -Wno-write-strings \
+                -DETK_DEBUG_LEVEL=3
+
+
+# load the common sources file of the platform
+include $(LOCAL_PATH)/file.mk
+
+LOCAL_SRC_FILES := $(FILE_LIST)
+
+#for freetype : https://github.com/cdave1/freetype2-android
+
+# Ewol Test Software :
+LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog -lz
+
+include $(BUILD_STATIC_LIBRARY)
+
+

jni/libetk/file.mk

@@ -0,0 +1,12 @@
+
+
+FILE_LIST = \
+			etk/Debug.cpp \
+			etk/DebugInternal.cpp \
+			etk/Memory.cpp \
+			etk/String.cpp \
+			etk/Stream.cpp \
+			etk/File.cpp \
+			etk/RegExp.cpp
+
+

jni/libewol/Android.mk

@@ -3,11 +3,11 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := ewol
-LOCAL_STATIC_LIBRARIES := libzip libpng
+LOCAL_STATIC_LIBRARIES := libetk libtinyxml libzip libpng 
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Sources $(LOCAL_PATH)/../libzip/ $(LOCAL_PATH)/../libpng/
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../libzip/ $(LOCAL_PATH)/../libpng/ $(LOCAL_PATH)/../libtinyxml/ $(LOCAL_PATH)/../libetk/
 
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../Sources
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_LDLIBS := -lGLESv1_CM -ldl -llog -lz
 
 LOCAL_CFLAGS := -D__PLATFORM__Android \
@@ -18,54 +18,16 @@ LOCAL_CFLAGS := -D__PLATFORM__Android \
                 -DVERSION_BUILD_TIME="\"pasd_heure\"" \
                 -DDATA_IN_APK \
 
-LOCAL_SRC_FILES := \
+# load the common sources file of the platform
-    ../../Sources/base/guiAndroid.cpp \
+include $(LOCAL_PATH)/file.mk
-    ../../Sources/tinyXML/tinyxml.cpp \
+
-    ../../Sources/tinyXML/tinyxmlparser.cpp \
+LOCAL_SRC_FILES := ewol/base/guiAndroid.cpp $(FILE_LIST)
-    ../../Sources/tinyXML/tinyxmlerror.cpp \
-    ../../Sources/tinyXML/tinystr.cpp \
-    ../../Sources/etk/Debug.cpp \
-    ../../Sources/etk/DebugInternal.cpp \
-    ../../Sources/etk/Memory.cpp \
-    ../../Sources/etk/String.cpp \
-    ../../Sources/etk/Stream.cpp \
-    ../../Sources/etk/File.cpp \
-    ../../Sources/etk/RegExp.cpp \
-    ../../Sources/ewol/ewol.cpp \
-    ../../Sources/ewol/Debug.cpp \
-    ../../Sources/ewol/OObject.cpp \
-    ../../Sources/ewol/OObject/2DText.cpp \
-    ../../Sources/ewol/OObject/2DColored.cpp \
-    ../../Sources/ewol/OObject/2DTextured.cpp \
-    ../../Sources/ewol/Texture.cpp \
-    ../../Sources/ewol/FontBitmap.cpp \
-    ../../Sources/ewol/Widget.cpp \
-    ../../Sources/ewol/WidgetManager.cpp \
-    ../../Sources/ewol/Windows.cpp \
-    ../../Sources/ewol/widget/Button.cpp \
-    ../../Sources/ewol/widget/CheckBox.cpp \
-    ../../Sources/ewol/widget/Entry.cpp \
-    ../../Sources/ewol/widget/List.cpp \
-    ../../Sources/ewol/widget/SizerHori.cpp \
-    ../../Sources/ewol/widget/SizerVert.cpp \
-    ../../Sources/ewol/widget/Test.cpp \
-    ../../Sources/ewol/themeManager.cpp \
-    ../../Sources/ewol/theme/Theme.cpp \
-    ../../Sources/ewol/theme/EolElement.cpp \
-    ../../Sources/ewol/theme/EolElementFrame.cpp \
-    ../../Sources/ewol/theme/EolColor.cpp \
-    ../../Sources/ewol/theme/EolBase.cpp \
-    ../../Sources/ewol/theme/EolBaseCircle.cpp \
-    ../../Sources/ewol/theme/EolBaseCirclePart.cpp \
-    ../../Sources/ewol/theme/EolBaseLine.cpp \
-    ../../Sources/ewol/theme/EolBasePolygone.cpp \
-    ../../Sources/ewol/theme/EolBaseRect.cpp \
-    ../../Sources/ewol/theme/EolBaseTriangle.cpp
 
 #for freetype : https://github.com/cdave1/freetype2-android
 
 # Ewol Test Software :
 LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog -lz
 
-#include $(BUILD_SHARED_LIBRARY)
 include $(BUILD_STATIC_LIBRARY)
+
+

jni/libewol/ewol/FontBitmap.cpp

@@ -26,7 +26,7 @@
 #include <ewol/Font.h>
 #include <ewol/Texture.h>
 #include <etk/VectorType.h>
-#include <importgl.h>
+#include <ewol/importgl.h>
 
 
 #undef __class__

jni/libewol/ewol/OObject.cpp

@@ -25,7 +25,7 @@
 #include <etk/Types.h>
 #include <etk/String.h>
 #include <ewol/OObject.h>
-#include <importgl.h>
+#include <ewol/importgl.h>
 
 
 #undef __class__

jni/libewol/ewol/OObject/2DColored.cpp

@@ -23,7 +23,7 @@
  */
 
 #include <ewol/OObject/2DColored.h>
-#include <importgl.h>
+#include <ewol/importgl.h>
 #include <math.h>
 
 

jni/libewol/ewol/OObject/2DText.cpp

@@ -23,7 +23,7 @@
  */
 
 #include <ewol/OObject/2DText.h>
-#include <importgl.h>
+#include <ewol/importgl.h>
 
 #undef __class__
 #define __class__	"ewol::OObject2DText"

jni/libewol/ewol/OObject/2DTextured.cpp

@@ -24,7 +24,7 @@
 
 #include <ewol/OObject/2DTextured.h>
 #include <ewol/Texture.h>
-#include <importgl.h>
+#include <ewol/importgl.h>
 
 #undef __class__
 #define __class__	"ewol::OObject2DTextured"

jni/libewol/ewol/Texture.cpp

@@ -25,7 +25,7 @@
 
 
 #include <ewol/Texture.h>
-#include <importgl.h>
+#include <ewol/importgl.h>
 #include <ewol/ewol.h>
 
 extern "C"

jni/libewol/ewol/Windows.cpp

@@ -30,7 +30,7 @@
 #include <ewol/Texture.h>
 #include <ewol/Font.h>
 #include <ewol/ewol.h>
-#include <importgl.h>
+#include <ewol/importgl.h>
 
 
 

jni/libewol/ewol/base/guiAndroid.cpp

@@ -33,10 +33,10 @@
 #include <ewol/Debug.h>
 #include <etk/String.h>
 #include <ewol/WidgetManager.h>
-#include <base/gui.h>
+#include <ewol/base/gui.h>
 #include <ewol/ewol.h>
 
-#include <importgl.h>
+#include <ewol/importgl.h>
 #include <ewol/Texture.h>
 
 #undef __class__

jni/libewol/ewol/ewol.cpp

@@ -28,7 +28,7 @@
 #include <ewol/WidgetManager.h>
 #include <ewol/themeManager.h>
 
-#include <base/gui.h>
+#include <ewol/base/gui.h>
 
 #undef __class__
 #define __class__	"ewol"