compilation Ok with moving the files

2011-11-23 11:37:38 +01:00 · 2011-11-23 11:37:38 +01:00 · 55c7b47553
commit 55c7b47553
parent 4fed0912ac
63 changed files with 231 additions and 228 deletions
--- a/53
+++ b/53
@ -167,38 +167,38 @@ MAKE_DEPENDENCE=Makefile
 ###############################################################################

 # Ewol Tool Kit :
-CXXFILES +=		etk/etkDebug.cpp \
-				etk/etkDebugInternal.cpp \
-				etk/etkMemory.cpp \
-				etk/etkString.cpp \
-				etk/etkFile.cpp \
-				etk/etkRegExp.cpp
+CXXFILES +=		etk/Debug.cpp \
+				etk/DebugInternal.cpp \
+				etk/Memory.cpp \
+				etk/String.cpp \
+				etk/File.cpp \
+				etk/RegExp.cpp

 # Ewol Sources :
-CXXFILES +=		ewol.cpp \
-				ewolDebug.cpp \
-				ewolOObject.cpp \
-				ewolOObject2DText.cpp \
-				ewolOObject2DColored.cpp \
-				ewolOObject2DTextured.cpp \
-				ewolTexture.cpp
+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 +=	ewolFontBitmap.cpp
+    CXXFILES +=	ewol/FontBitmap.cpp
 else
-    CXXFILES +=	ewolFontFreeType.cpp
+    CXXFILES +=	ewol/FontFreeType.cpp
 endif
-CXXFILES +=		ewolWidget.cpp \
-				ewolWidgetManager.cpp \
-				ewolWindows.cpp
+CXXFILES +=		ewol/Widget.cpp \
+				ewol/WidgetManager.cpp \
+				ewol/Windows.cpp
 # list of widgets :
-CXXFILES +=		widget/ewolButton.cpp \
-				widget/ewolCheckBox.cpp \
-				widget/ewolEntry.cpp \
-				widget/ewolList.cpp \
-				widget/ewolSizerHori.cpp \
-				widget/ewolSizerVert.cpp
+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 +=		widget/ewolTest.cpp
+CXXFILES +=		ewol/widget/Test.cpp


 # Ewol Test Software :
@ -212,6 +212,8 @@ CXXFILES +=		Main.cpp
 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                                                 ###
@ -240,6 +242,7 @@ build: .encadrer .versionFile $(OUTPUT_NAME)
 	@echo $(CADRE_HAUT_BAS)
 	@mkdir -p $(addprefix $(OBJECT_DIRECTORY)/, $(LISTE_MODULES))

+
 .versionFile:
 	@rm -f $(OBJECT_DIRECTORY)/ewol.o

--- a/Sources/Main.cpp
+++ b/Sources/Main.cpp
@ -23,13 +23,13 @@
 */


-#include <ewol.h>
-#include <ewolFont.h>
-#include <widget/ewolButton.h>
-#include <widget/ewolCheckBox.h>
-#include <widget/ewolSizerHori.h>
-#include <widget/ewolSizerVert.h>
-#include <widget/ewolTest.h>
+#include <ewol/ewol.h>
+#include <ewol/Font.h>
+#include <ewol/widget/Button.h>
+#include <ewol/widget/CheckBox.h>
+#include <ewol/widget/SizerHori.h>
+#include <ewol/widget/SizerVert.h>
+#include <ewol/widget/Test.h>

 #include <unistd.h>
 #include <stdlib.h>
--- a/Sources/base/guiAndroid.cpp
+++ b/Sources/base/guiAndroid.cpp
@ -25,8 +25,8 @@



-#include <ewolDebug.h>
-#include <guiAndroid.h>
+#include <ewol/Debug.h>
+#include <base/guiAndroid.h>

 #undef __class__
 #define __class__ "guiAbstraction"
--- a/Sources/base/guiAndroid.h
+++ b/Sources/base/guiAndroid.h
@ -26,7 +26,7 @@
 #ifndef __GUI_ABSTRACTION_H__
 #define __GUI_ABSTRACTION_H__

-#include <etkTypes.h>
+#include <etk/Types.h>

 namespace guiAbstraction
 {
--- a/Sources/base/guiDoubleBuffer.cpp
+++ b/Sources/base/guiDoubleBuffer.cpp
@ -23,8 +23,8 @@
 */


-#include <ewolDebug.h>
-#include <guiDoubleBuffer.h>
+#include <ewol/Debug.h>
+#include <base/guiDoubleBuffer.h>

 #undef __class__
 #define __class__ "guiAbstraction"
--- a/Sources/base/guiDoubleBuffer.h
+++ b/Sources/base/guiDoubleBuffer.h
@ -26,7 +26,7 @@
 #ifndef __GUI_ABSTRACTION_H__
 #define __GUI_ABSTRACTION_H__

-#include <etkTypes.h>
+#include <etk/Types.h>

 namespace guiAbstraction
 {
--- a/Sources/base/guiIPhone.cpp
+++ b/Sources/base/guiIPhone.cpp
@ -23,8 +23,8 @@
 */


-#include <ewolDebug.h>
-#include <guiIPhone.h>
+#include <ewol/Debug.h>
+#include <base/guiIPhone.h>

 #undef __class__
 #define __class__ "guiAbstraction"
--- a/Sources/base/guiIPhone.h
+++ b/Sources/base/guiIPhone.h
@ -26,7 +26,7 @@
 #ifndef __GUI_ABSTRACTION_H__
 #define __GUI_ABSTRACTION_H__

-#include <etkTypes.h>
+#include <etk/Types.h>

 namespace guiAbstraction
 {
--- a/Sources/base/guiX11.cpp
+++ b/Sources/base/guiX11.cpp
@ -23,10 +23,10 @@
 */


-#include <ewolDebug.h>
-#include <etkString.h>
-#include <ewolWidgetManager.h>
-#include <guiX11.h>
+#include <ewol/Debug.h>
+#include <etk/String.h>
+#include <ewol/WidgetManager.h>
+#include <base/guiX11.h>

 #include <stdlib.h>
 #include <stdio.h>
--- a/Sources/base/guiX11.h
+++ b/Sources/base/guiX11.h
@ -26,8 +26,8 @@
 #ifndef __GUI_ABSTRACTION_H__
 #define __GUI_ABSTRACTION_H__

-#include <etkTypes.h>
-#include <ewolWindows.h>
+#include <etk/Types.h>
+#include <ewol/Windows.h>

 namespace guiAbstraction
 {
--- a/Sources/etk/etkDebug.cpp
+++ b/Sources/etk/etkDebug.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file etkDebug.h
+ * @file etk/Debug.h
 * @brief Ewol Tool Kit : log implementation
 * @author Edouard DUPIN
 * @date 08/06/2010
@ -22,7 +22,7 @@
 *******************************************************************************
 */

-#include <etkDebug.h>
+#include <etk/Debug.h>
 #include <time.h>

 // Max string size : (wide screan console nb caractere)
--- a/Sources/etk/etkDebug.h
+++ b/Sources/etk/etkDebug.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file etkDebug.h
+ * @file etk/Debug.h
 * @brief Ewol Tool Kit : log implementation
 * @author Edouard DUPIN
 * @date 08/06/2010
@ -26,7 +26,7 @@
 #define __ETK_DEBUG_H__

 #include <iostream>
-#include <etkTypes.h>
+#include <etk/Types.h>

 // Log Message System For EDN
 void TOOLS_DisplayFuncName(int32_t ligne, const char* className, const char* funcName, const char* libName);
--- a/Sources/etk/etkDebugInternal.cpp
+++ b/Sources/etk/etkDebugInternal.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file etkDebugInternal.cpp
+ * @file etk/DebugInternal.cpp
 * @brief Ewol Tool Kit : log wrapper (sources)
 * @author Edouard DUPIN
 * @date 19/10/2011
--- a/Sources/etk/etkDebugInternal.h
+++ b/Sources/etk/etkDebugInternal.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file etkDebugInternal.h
+ * @file etk/DebugInternal.h
 * @brief Ewol Tool Kit : log wrapper (header)
 * @author Edouard DUPIN
 * @date 19/10/2011
@ -25,7 +25,7 @@
 #ifndef __ETK_DEBUG_INTERNAL_H__
 #define __ETK_DEBUG_INTERNAL_H__

-#include "etkDebug.h"
+#include "etk/Debug.h"

 extern const char * etkLibName;

--- a/Sources/etk/etkFile.cpp
+++ b/Sources/etk/etkFile.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file etkFile.cpp
+ * @file etk/File.cpp
 * @brief Ewol Tool Kit : File folder and name abstraction (Sources)
 * @author Edouard DUPIN
 * @date 16/07/2011
@ -23,9 +23,9 @@
 */


-#include <etkTypes.h>
-#include <etkDebugInternal.h>
-#include <etkFile.h>
+#include <etk/Types.h>
+#include <etk/DebugInternal.h>
+#include <etk/File.h>


 #undef __class__
--- a/Sources/etk/etkFile.h
+++ b/Sources/etk/etkFile.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file etkFile.h
+ * @file etk/File.h
 * @brief Ewol Tool Kit : File folder and name abstraction (header)
 * @author Edouard DUPIN
 * @date 16/07/2011
@ -25,7 +25,7 @@
 #ifndef __ETK_FILE_H__
 #define __ETK_FILE_H__

-#include <etkString.h>
+#include <etk/String.h>

 #define MAX_FILE_NAME      (10240)

--- a/Sources/etk/etkMemory.cpp
+++ b/Sources/etk/etkMemory.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file etkMemory.cpp
+ * @file etk/Memory.cpp
 * @brief Ewol Tool Kit : Memory implementation (Sources)
 * @author Edouard DUPIN
 * @date 19/10/2011
@ -22,8 +22,8 @@
 *******************************************************************************
 */

-#include <etkTypes.h>
-#include <etkMemory.h>
+#include <etk/Types.h>
+#include <etk/Memory.h>

 // General 
 #if ETK_MEMORY_CHECKER > 0
--- a/Sources/etk/etkMemory.h
+++ b/Sources/etk/etkMemory.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file etkMemory.h
+ * @file etk/Memory.h
 * @brief Ewol Tool Kit : Memory implementation (headers)
 * @author Edouard DUPIN
 * @date 12/01/2011
--- a/Sources/etk/etkRegExp.cpp
+++ b/Sources/etk/etkRegExp.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file etkExp.cpp
+ * @file etk/RegExp.cpp
 * @brief Ewol Tool Kit : Regular expression annalyser (sources)
 * @author Edouard DUPIN
 * @date 04/04/2011
@ -22,7 +22,7 @@
 *******************************************************************************
 */

-#include <etkRegExp.h>
+#include <etk/RegExp.h>



--- a/Sources/etk/etkRegExp.h
+++ b/Sources/etk/etkRegExp.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file etkExp.h
+ * @file etk/RegExp.h
 * @brief Ewol Tool Kit : Regular expression annalyser (header)
 * @author Edouard DUPIN
 * @date 04/04/2011
@ -25,11 +25,11 @@
 #ifndef __TK_REG_EXP_H__
 #define __TK_REG_EXP_H__

-#include <etkTypes.h>
-#include <etkDebugInternal.h>
-#include <etkMemory.h>
-#include <etkString.h>
-#include <etkVectorType.h>
+#include <etk/Types.h>
+#include <etk/DebugInternal.h>
+#include <etk/Memory.h>
+#include <etk/String.h>
+#include <etk/VectorType.h>

 namespace etk {

--- a/Sources/etk/etkSingleton.h
+++ b/Sources/etk/etkSingleton.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file etkSingleton.h
+ * @file etk/Singleton.h
 * @brief ewol : singleton system class
 * @author Edouard DUPIN
 * @date 04/12/2010
--- a/Sources/etk/etkString.cpp
+++ b/Sources/etk/etkString.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file etkString.cpp
+ * @file etk/String.cpp
 * @brief Ewol Tool Kit : normal sting management... (sources)
 * @author Edouard DUPIN
 * @date 26/01/2011
@ -22,8 +22,8 @@
 *******************************************************************************
 */

-#include <etkString.h>
-#include <etkMemory.h>
+#include <etk/String.h>
+#include <etk/Memory.h>


 #undef __class__
--- a/Sources/etk/etkString.h
+++ b/Sources/etk/etkString.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file etkString.h
+ * @file etk/String.h
 * @brief Ewol Tool Kit : normal sting management... (header)
 * @author Edouard DUPIN
 * @date 26/01/2011
@ -26,7 +26,7 @@
 #define __ETK_STRING_H__

 #include <iostream>
-#include <etkVectorType.h>
+#include <etk/VectorType.h>

 namespace etk
 {
--- a/Sources/etk/etkTypes.h
+++ b/Sources/etk/etkTypes.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file etkTypes.h
+ * @file etk/Types.h
 * @brief Ewol Tool Kit : generique define type
 * @author Edouard DUPIN
 * @date 08/06/2010
--- a/Sources/etk/etkVector.h
+++ b/Sources/etk/etkVector.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file etkVector.h
+ * @file etk/Vector.h
 * @brief Ewol Tool Kit : Basic etk::Vector (template)
 * @author Edouard DUPIN
 * @date 07/04/2011
@ -25,8 +25,8 @@
 #ifndef __ETK_VECTOR_H__
 #define __ETK_VECTOR_H__

-#include <etkType.h>
-#include <etkMemory.h>
+#include <etk/Type.h>
+#include <etk/Memory.h>

 #undef __class__
 #define __class__	"etk::Vector"
--- a/Sources/etk/etkVectorType.h
+++ b/Sources/etk/etkVectorType.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file etkVectorType.h
+ * @file etk/VectorType.h
 * @brief Ewol Tool Kit : Basic VectorType for direct data insertion (template)
 * @author Edouard DUPIN
 * @date 07/04/2011
@ -25,9 +25,9 @@
 #ifndef __ETK_VECTOR_TYPE_H__
 #define __ETK_VECTOR_TYPE_H__

-#include <etkTypes.h>
-#include <etkDebugInternal.h>
-#include <etkMemory.h>
+#include <etk/Types.h>
+#include <etk/DebugInternal.h>
+#include <etk/Memory.h>

 #undef __class__
 #define __class__	"etk::VectorType"
--- a/Sources/ewol/Debug.cpp
+++ b/Sources/ewol/Debug.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolDebug.h
+ * @file ewol/Debug.h
 * @brief Ewol : log wrapper (Sources)
 * @author Edouard DUPIN
 * @date 19/10/2010
@ -23,6 +23,6 @@
 */


-#include <ewolDebug.h>
+#include <ewol/Debug.h>

 const char * ewolLibName = "ewol    ";
--- a/Sources/ewol/Debug.h
+++ b/Sources/ewol/Debug.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolDebug.h
+ * @file ewol/Debug.h
 * @brief Ewol : log wrapper (header)
 * @author Edouard DUPIN
 * @date 19/10/2010
@ -25,8 +25,8 @@
 #ifndef __EWOL_DEBUG_H__
 #define __EWOL_DEBUG_H__

-#include <etkTypes.h>
-#include <etkDebug.h>
+#include <etk/Types.h>
+#include <etk/Debug.h>

 extern const char * ewolLibName;

--- a/Sources/ewol/Font.h
+++ b/Sources/ewol/Font.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolFont.h
+ * @file ewol/Font.h
 * @brief ewol Font system (header)
 * @author Edouard DUPIN
 * @date 29/10/2011
@ -25,9 +25,9 @@
 #ifndef __EWOL_FONT_H__
 #define __EWOL_FONT_H__

-#include <etkTypes.h>
-#include <ewolDebug.h>
-#include <etkFile.h>
+#include <etk/Types.h>
+#include <ewol/Debug.h>
+#include <etk/File.h>


 namespace ewol
--- a/Sources/ewol/FontBitmap.cpp
+++ b/Sources/ewol/FontBitmap.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolFontBitmap.cpp
+ * @file ewol/FontBitmap.cpp
 * @brief ewol Font system (sources)
 * @author Edouard DUPIN
 * @date 29/10/2011
@ -23,9 +23,9 @@
 */


-#include <ewolFont.h>
-#include <ewolTexture.h>
-#include <etkVectorType.h>
+#include <ewol/Font.h>
+#include <ewol/Texture.h>
+#include <etk/VectorType.h>


 #include <GL/gl.h>
--- a/Sources/ewol/FontFreeType.cpp
+++ b/Sources/ewol/FontFreeType.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolFontFreeType.cpp
+ * @file ewol/FontFreeType.cpp
 * @brief ewol Font system wrapper on freetype(sources)
 * @author Edouard DUPIN
 * @date 05/11/2011
@ -23,9 +23,9 @@
 */


-#include <ewolFont.h>
-#include <ewolTexture.h>
-#include <etkVectorType.h>
+#include <ewol/Font.h>
+#include <ewol/Texture.h>
+#include <etk/VectorType.h>


 #include <GL/gl.h>
--- a/Sources/ewol/OObject.cpp
+++ b/Sources/ewol/OObject.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolOObject.cpp
+ * @file ewol/OObject.cpp
 * @brief ewol OpenGl Object system (Sources)
 * @author Edouard DUPIN
 * @date 24/10/2011
@ -22,9 +22,9 @@
 *******************************************************************************
 */

-#include <etkTypes.h>
-#include <etkString.h>
-#include <ewolOObject.h>
+#include <etk/Types.h>
+#include <etk/String.h>
+#include <ewol/OObject.h>
 #include <GL/gl.h>


--- a/Sources/ewol/OObject.h
+++ b/Sources/ewol/OObject.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolOObject.h
+ * @file ewol/OObject.h
 * @brief ewol OpenGl Object system (header)
 * @author Edouard DUPIN
 * @date 24/10/2011
@ -25,11 +25,11 @@
 #ifndef __EWOL_O_OBJECT_H__
 #define __EWOL_O_OBJECT_H__

-#include <etkTypes.h>
-#include <etkFile.h>
-#include <ewolDebug.h>
-#include <ewolFont.h>
-#include <etkVectorType.h>
+#include <etk/Types.h>
+#include <etk/File.h>
+#include <ewol/Debug.h>
+#include <ewol/Font.h>
+#include <etk/VectorType.h>

 namespace ewol {
 	extern "C" {
@ -78,7 +78,7 @@ namespace ewol {
 #endif


-#include <ewolOObject2DTextured.h>
-#include <ewolOObject2DColored.h>
-#include <ewolOObject2DText.h>
+#include <ewol/OObject/2DTextured.h>
+#include <ewol/OObject/2DColored.h>
+#include <ewol/OObject/2DText.h>

--- a/Sources/ewol/OObject/2DColored.cpp
+++ b/Sources/ewol/OObject/2DColored.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolOObject2DColored.cpp
+ * @file ewol/OObject/2DColored.cpp
 * @brief ewol OpenGl Object system (Sources)
 * @author Edouard DUPIN
 * @date 09/11/2011
@ -22,7 +22,7 @@
 *******************************************************************************
 */

-#include <ewolOObject2DColored.h>
+#include <ewol/OObject/2DColored.h>
 #include <GL/gl.h>
 #include <math.h>

--- a/Sources/ewol/OObject/2DColored.h
+++ b/Sources/ewol/OObject/2DColored.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolOObject2DColored.h
+ * @file ewol/OObject/2DColored.h
 * @brief ewol OpenGl Object system (header)
 * @author Edouard DUPIN
 * @date 09/11/2011
@ -25,7 +25,7 @@
 #ifndef __EWOL_O_OBJECT_2D_COLORED_H__
 #define __EWOL_O_OBJECT_2D_COLORED_H__

-#include <ewolOObject.h>
+#include <ewol/OObject.h>

 namespace ewol {
 	class OObject2DColored :public ewol::OObject
--- a/Sources/ewol/OObject/2DText.cpp
+++ b/Sources/ewol/OObject/2DText.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolOObject2DText.cpp
+ * @file ewol/OObject/2DText.cpp
 * @brief ewol OpenGl Object system (Sources)
 * @author Edouard DUPIN
 * @date 09/11/2011
@ -22,7 +22,7 @@
 *******************************************************************************
 */

-#include <ewolOObject2DText.h>
+#include <ewol/OObject/2DText.h>
 #include <GL/gl.h>

 #undef __class__
--- a/Sources/ewol/OObject/2DText.h
+++ b/Sources/ewol/OObject/2DText.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolOObject2DText.h
+ * @file ewol/OObject/2DText.h
 * @brief ewol OpenGl Object system (header)
 * @author Edouard DUPIN
 * @date 09/11/2011
@ -25,7 +25,7 @@
 #ifndef __EWOL_O_OBJECT_2D_TEXT_H__
 #define __EWOL_O_OBJECT_2D_TEXT_H__

-#include <ewolOObject.h>
+#include <ewol/OObject.h>

 namespace ewol {
 	class OObject2DText :public ewol::OObject
--- a/Sources/ewol/OObject/2DTextured.cpp
+++ b/Sources/ewol/OObject/2DTextured.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolOObject2DTextured.cpp
+ * @file ewol/OObject/2DTextured.cpp
 * @brief ewol OpenGl Object system (Sources)
 * @author Edouard DUPIN
 * @date 09/11/2011
@ -22,8 +22,8 @@
 *******************************************************************************
 */

-#include <ewolOObject2DTextured.h>
-#include <ewolTexture.h>
+#include <ewol/OObject/2DTextured.h>
+#include <ewol/Texture.h>
 #include <GL/gl.h>

 #undef __class__
--- a/Sources/ewol/OObject/2DTextured.h
+++ b/Sources/ewol/OObject/2DTextured.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolOObject2DTextured.h
+ * @file ewol/OObject/2DTextured.h
 * @brief ewol OpenGl Object system (header)
 * @author Edouard DUPIN
 * @date 09/11/2011
@ -25,7 +25,7 @@
 #ifndef __EWOL_O_OBJECT_2D_TEXTURED_H__
 #define __EWOL_O_OBJECT_2D_TEXTURED_H__

-#include <ewolOObject.h>
+#include <ewol/OObject.h>

 namespace ewol {
 	class OObject2DTextured :public ewol::OObject
--- a/Sources/ewol/Texture.cpp
+++ b/Sources/ewol/Texture.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolTexture.cpp
+ * @file ewol/Texture.cpp
 * @brief ewol Texture loading system (sources)
 * @author Edouard DUPIN
 * @date 28/10/2011
@ -24,7 +24,7 @@



-#include <ewolTexture.h>
+#include <ewol/Texture.h>

 extern "C"
 {
--- a/Sources/ewol/Texture.h
+++ b/Sources/ewol/Texture.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolTexture.h
+ * @file ewol/Texture.h
 * @brief ewol Texture loading system (header)
 * @author Edouard DUPIN
 * @date 28/10/2011
@ -25,9 +25,9 @@
 #ifndef __EWOL_TEXTURE_H__
 #define __EWOL_TEXTURE_H__

-#include <etkTypes.h>
-#include <ewolDebug.h>
-#include <etkFile.h>
+#include <etk/Types.h>
+#include <ewol/Debug.h>
+#include <etk/File.h>

 namespace ewol
 {
--- a/Sources/ewol/Widget.cpp
+++ b/Sources/ewol/Widget.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolWidget.cpp
+ * @file ewol/Widget.cpp
 * @brief basic ewol Widget (Sources)
 * @author Edouard DUPIN
 * @date 18/10/2011
@ -22,8 +22,8 @@
 *******************************************************************************
 */

-#include <ewolWidget.h>
-#include <ewolWidgetManager.h>
+#include <ewol/Widget.h>
+#include <ewol/WidgetManager.h>

 #undef __class__
 #define __class__	"ewol::Widget"
--- a/Sources/ewol/Widget.h
+++ b/Sources/ewol/Widget.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolWidget.h
+ * @file ewol/Widget.h
 * @brief basic ewol Widget (header)
 * @author Edouard DUPIN
 * @date 18/10/2011
@ -25,10 +25,10 @@
 #ifndef __EWOL_WIDGET_H__
 #define __EWOL_WIDGET_H__

-#include <etkTypes.h>
-#include <ewolDebug.h>
-#include <ewolOObject.h>
-#include <etkVectorType.h>
+#include <etk/Types.h>
+#include <ewol/Debug.h>
+#include <ewol/OObject.h>
+#include <etk/VectorType.h>

 namespace ewol {
 	extern "C" {
--- a/Sources/ewol/WidgetManager.cpp
+++ b/Sources/ewol/WidgetManager.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolWidgetManager.cpp
+ * @file ewol/WidgetManager.cpp
 * @brief basic ewol Widget Manager (Sources)
 * @author Edouard DUPIN
 * @date 13/11/2011
@ -22,7 +22,7 @@
 *******************************************************************************
 */

-#include <ewolWidgetManager.h>
+#include <ewol/WidgetManager.h>

 #undef __class__
 #define __class__	"ewol::WidgetManager"
--- a/Sources/ewol/WidgetManager.h
+++ b/Sources/ewol/WidgetManager.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolWidgetManager.h
+ * @file ewol/WidgetManager.h
 * @brief basic ewol Widget Manager (Header)
 * @author Edouard DUPIN
 * @date 13/11/2011
@ -25,11 +25,11 @@
 #ifndef __EWOL_WIDGET_MANAGER_H__
 #define __EWOL_WIDGET_MANAGER_H__

-#include <etkTypes.h>
-#include <ewolDebug.h>
-#include <ewolOObject.h>
-#include <etkVectorType.h>
-#include <ewolWidget.h>
+#include <etk/Types.h>
+#include <ewol/Debug.h>
+#include <ewol/OObject.h>
+#include <etk/VectorType.h>
+#include <ewol/Widget.h>

 namespace ewol {
 	namespace widgetManager {
--- a/Sources/ewol/Windows.cpp
+++ b/Sources/ewol/Windows.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolWindows.cpp
+ * @file ewol/Windows.cpp
 * @brief ewol window system (sources)
 * @author Edouard DUPIN
 * @date 20/10/2011
@ -22,14 +22,14 @@
 *******************************************************************************
 */

-#include <etkTypes.h>
-#include <etkString.h>
-#include <ewolWidget.h>
-#include <ewolWindows.h>
-#include <ewolOObject.h>
-#include <ewolTexture.h>
-#include <ewolFont.h>
-#include <ewol.h>
+#include <etk/Types.h>
+#include <etk/String.h>
+#include <ewol/Widget.h>
+#include <ewol/Windows.h>
+#include <ewol/OObject.h>
+#include <ewol/Texture.h>
+#include <ewol/Font.h>
+#include <ewol/ewol.h>
 #include <GL/gl.h>


--- a/Sources/ewol/Windows.h
+++ b/Sources/ewol/Windows.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolWindows.h
+ * @file ewol/Windows.h
 * @brief ewol window system (header)
 * @author Edouard DUPIN
 * @date 20/10/2011
@ -25,11 +25,11 @@
 #ifndef __EWOL_WINDOWS_H__
 #define __EWOL_WINDOWS_H__

-#include <etkTypes.h>
-#include <ewolDebug.h>
-#include <etkVectorType.h>
-#include <etkSingleton.h>
-#include <ewolWidget.h>
+#include <etk/Types.h>
+#include <ewol/Debug.h>
+#include <etk/VectorType.h>
+#include <etk/Singleton.h>
+#include <ewol/Widget.h>

 namespace ewol {
 	class Windows :public ewol::Widget
--- a/Sources/ewol/ewol.cpp
+++ b/Sources/ewol/ewol.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewol.cpp
+ * @file ewol/ewol.cpp
 * @brief Main code of ewol (sources)
 * @author Edouard DUPIN
 * @date 17/10/2011
@ -23,22 +23,22 @@
 */


-#include "ewol.h"
-#include "ewolFont.h"
-#include "ewolWidgetManager.h"
+#include "ewol/ewol.h"
+#include "ewol/Font.h"
+#include "ewol/WidgetManager.h"

 #if __PLATFORM__ == X11
-	#include "guiX11.h"
+	#include "base/guiX11.h"
 #elif __PLATFORM__ == DoubleBuffer
-	#include "guiDoubleBuffer.h"
+	#include "base/guiDoubleBuffer.h"
 #elif __PLATFORM__ == Android
-	#include "guiAndroid.h"
+	#include "base/guiAndroid.h"
 #elif __PLATFORM__ == AndroidTablet
-	#include "guiAndroidTablet.h"
+	#include "base/guiAndroidTablet.h"
 #elif __PLATFORM__ == IPhone
-	#include "guiIPhone.h"
+	#include "base/guiIPhone.h"
 #elif __PLATFORM__ == IPad
-	#include "guiIPad.h"
+	#include "base/guiIPad.h"
 #else
 	#error you need to specify a platform ...
 #endif
--- a/Sources/ewol/ewol.h
+++ b/Sources/ewol/ewol.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewol.h
+ * @file ewol/ewol.h
 * @brief Main include of ewol (header)
 * @author Edouard DUPIN
 * @date 17/10/2011
@ -26,10 +26,10 @@
 #ifndef __EWOL_H__
 #define __EWOL_H__

-#include <etkTypes.h>
-#include <etkString.h>
-#include <ewolWidget.h>
-#include <ewolWindows.h>
+#include <etk/Types.h>
+#include <etk/String.h>
+#include <ewol/Widget.h>
+#include <ewol/Windows.h>

 namespace ewol {
 	void Init(int32_t argc, char *argv[]);
--- a/Sources/ewol/widget/Button.cpp
+++ b/Sources/ewol/widget/Button.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolButton.cpp
+ * @file ewol/widget/Button.cpp
 * @brief ewol Button widget system (Sources)
 * @author Edouard DUPIN
 * @date 07/11/2011
@ -22,10 +22,10 @@
 *******************************************************************************
 */

-#include <widget/ewolButton.h>
+#include <ewol/widget/Button.h>

-#include <ewolOObject.h>
-#include <ewolWidgetManager.h>
+#include <ewol/OObject.h>
+#include <ewol/WidgetManager.h>


 const char * const ewolEventButtonPressed    = "ewol Button Pressed";
--- a/Sources/ewol/widget/Button.h
+++ b/Sources/ewol/widget/Button.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolButton.h
+ * @file ewol/widget/Button.h
 * @brief ewol Button widget system (header)
 * @author Edouard DUPIN
 * @date 07/11/2011
@ -25,9 +25,9 @@
 #ifndef __EWOL_BUTTON_H__
 #define __EWOL_BUTTON_H__

-#include <etkTypes.h>
-#include <ewolDebug.h>
-#include <ewolWidget.h>
+#include <etk/Types.h>
+#include <ewol/Debug.h>
+#include <ewol/Widget.h>

 namespace ewol {
 	class Button :public ewol::Widget
--- a/Sources/ewol/widget/CheckBox.cpp
+++ b/Sources/ewol/widget/CheckBox.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolCheckBox.cpp
+ * @file ewol/widget/CheckBox.cpp
 * @brief ewol check-box widget system (Sources)
 * @author Edouard DUPIN
 * @date 07/11/2011
@ -23,10 +23,10 @@
 */


-#include <widget/ewolCheckBox.h>
+#include <ewol/widget/CheckBox.h>

-#include <ewolOObject.h>
-#include <ewolWidgetManager.h>
+#include <ewol/OObject.h>
+#include <ewol/WidgetManager.h>


 const char * ewolEventCheckBoxClicked    = "ewol CheckBox Clicked";
--- a/Sources/ewol/widget/CheckBox.h
+++ b/Sources/ewol/widget/CheckBox.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolCheckBox.h
+ * @file ewol/widget/CheckBox.h
 * @brief ewol check-box widget system (header)
 * @author Edouard DUPIN
 * @date 07/11/2011
@ -25,9 +25,9 @@
 #ifndef __EWOL_CHECK_BOX_H__
 #define __EWOL_CHECK_BOX_H__

-#include <etkTypes.h>
-#include <ewolDebug.h>
-#include <ewolWidget.h>
+#include <etk/Types.h>
+#include <ewol/Debug.h>
+#include <ewol/Widget.h>

 namespace ewol {
 	class CheckBox :public ewol::Widget
--- a/Sources/ewol/widget/Entry.cpp
+++ b/Sources/ewol/widget/Entry.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolEntry.cpp
+ * @file ewol/widget/Entry.cpp
 * @brief ewol entry widget system (Sources)
 * @author Edouard DUPIN
 * @date 07/11/2011
@ -23,7 +23,7 @@
 */


-#include <widget/ewolEntry.h>
+#include <ewol/widget/Entry.h>

 #undef __class__
 #define __class__	"ewol::Entry"
--- a/Sources/ewol/widget/Entry.h
+++ b/Sources/ewol/widget/Entry.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolEntry.h
+ * @file ewol/widget/Entry.h
 * @brief ewol entry widget system (header)
 * @author Edouard DUPIN
 * @date 07/11/2011
@ -25,9 +25,9 @@
 #ifndef __EWOL_ENTRY_H__
 #define __EWOL_ENTRY_H__

-#include <etkTypes.h>
-#include <ewolDebug.h>
-#include <ewolWidget.h>
+#include <etk/Types.h>
+#include <ewol/Debug.h>
+#include <ewol/Widget.h>

 namespace ewol {
 	class Entry :public ewol::Widget
--- a/Sources/ewol/widget/List.cpp
+++ b/Sources/ewol/widget/List.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolList.cpp
+ * @file ewol/widget/List.cpp
 * @brief ewol list widget system (Sources)
 * @author Edouard DUPIN
 * @date 07/11/2011
@ -23,7 +23,7 @@
 */


-#include <widget/ewolList.h>
+#include <ewol/widget/List.h>

 #undef __class__
 #define __class__	"ewol::List"
--- a/Sources/ewol/widget/List.h
+++ b/Sources/ewol/widget/List.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolList.h
+ * @file ewol/widget/List.h
 * @brief ewol list widget system (header)
 * @author Edouard DUPIN
 * @date 07/11/2011
@ -25,9 +25,9 @@
 #ifndef __EWOL_LIST_H__
 #define __EWOL_LIST_H__

-#include <etkTypes.h>
-#include <ewolDebug.h>
-#include <ewolWidget.h>
+#include <etk/Types.h>
+#include <ewol/Debug.h>
+#include <ewol/Widget.h>

 namespace ewol {
 	class List :public ewol::Widget
--- a/Sources/ewol/widget/SizerHori.cpp
+++ b/Sources/ewol/widget/SizerHori.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolSizerHori.cpp
+ * @file ewol/widget/SizerHori.cpp
 * @brief ewol hirisantal sizer widget system (Sources)
 * @author Edouard DUPIN
 * @date 07/11/2011
@ -24,7 +24,7 @@



-#include <widget/ewolSizerHori.h>
+#include <ewol/widget/SizerHori.h>

 #undef __class__
 #define __class__	"ewol::SizerHori"
--- a/Sources/ewol/widget/SizerHori.h
+++ b/Sources/ewol/widget/SizerHori.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolSizerHori.h
+ * @file ewol/widget/SizerHori.h
 * @brief ewol hirisantal sizer widget system (header)
 * @author Edouard DUPIN
 * @date 07/11/2011
@ -25,9 +25,9 @@
 #ifndef __EWOL_SIZER_HORI_H__
 #define __EWOL_SIZER_HORI_H__

-#include <etkTypes.h>
-#include <ewolDebug.h>
-#include <ewolWidget.h>
+#include <etk/Types.h>
+#include <ewol/Debug.h>
+#include <ewol/Widget.h>

 namespace ewol {
 	class SizerHori :public ewol::Widget
--- a/Sources/ewol/widget/SizerVert.cpp
+++ b/Sources/ewol/widget/SizerVert.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolSizerVert.cpp
+ * @file ewol/widget/SizerVert.cpp
 * @brief ewol vertical sizer widget system (Sources)
 * @author Edouard DUPIN
 * @date 07/11/2011
@ -23,7 +23,7 @@
 */


-#include <widget/ewolSizerVert.h>
+#include <ewol/widget/SizerVert.h>


 #undef __class__
--- a/Sources/ewol/widget/SizerVert.h
+++ b/Sources/ewol/widget/SizerVert.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolSizerVert.h
+ * @file ewol/widget/SizerVert.h
 * @brief ewol vertical sizer widget system (header)
 * @author Edouard DUPIN
 * @date 07/11/2011
@ -25,9 +25,9 @@
 #ifndef __EWOL_SIZER_VERT_H__
 #define __EWOL_SIZER_VERT_H__

-#include <etkTypes.h>
-#include <ewolDebug.h>
-#include <ewolWidget.h>
+#include <etk/Types.h>
+#include <ewol/Debug.h>
+#include <ewol/Widget.h>

 namespace ewol {
 	class SizerVert :public ewol::Widget
--- a/Sources/ewol/widget/Test.cpp
+++ b/Sources/ewol/widget/Test.cpp
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolTest.cpp
+ * @file ewol/widget/Test.cpp
 * @brief ewol Test widget system (Sources)
 * @author Edouard DUPIN
 * @date 07/11/2011
@ -22,9 +22,9 @@
 *******************************************************************************
 */

-#include <widget/ewolTest.h>
+#include <ewol/widget/Test.h>

-#include <ewolOObject.h>
+#include <ewol/OObject.h>



--- a/Sources/ewol/widget/Test.h
+++ b/Sources/ewol/widget/Test.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file ewolTest.h
+ * @file ewol/widget/Test.h
 * @brief ewol test widget system (header)
 * @author Edouard DUPIN
 * @date 07/11/2011
@ -25,9 +25,9 @@
 #ifndef __EWOL_TEST_H__
 #define __EWOL_TEST_H__

-#include <etkTypes.h>
-#include <ewolDebug.h>
-#include <ewolWidget.h>
+#include <etk/Types.h>
+#include <ewol/Debug.h>
+#include <ewol/Widget.h>

 namespace ewol {
 	class Test :public ewol::Widget