compilation Ok with moving the files

This commit is contained in:
Edouard Dupin 2011-11-23 11:37:38 +01:00
parent 4fed0912ac
commit 55c7b47553
63 changed files with 231 additions and 228 deletions

View File

@ -167,38 +167,38 @@ MAKE_DEPENDENCE=Makefile
############################################################################### ###############################################################################
# Ewol Tool Kit : # Ewol Tool Kit :
CXXFILES += etk/etkDebug.cpp \ CXXFILES += etk/Debug.cpp \
etk/etkDebugInternal.cpp \ etk/DebugInternal.cpp \
etk/etkMemory.cpp \ etk/Memory.cpp \
etk/etkString.cpp \ etk/String.cpp \
etk/etkFile.cpp \ etk/File.cpp \
etk/etkRegExp.cpp etk/RegExp.cpp
# Ewol Sources : # Ewol Sources :
CXXFILES += ewol.cpp \ CXXFILES += ewol/ewol.cpp \
ewolDebug.cpp \ ewol/Debug.cpp \
ewolOObject.cpp \ ewol/OObject.cpp \
ewolOObject2DText.cpp \ ewol/OObject/2DText.cpp \
ewolOObject2DColored.cpp \ ewol/OObject/2DColored.cpp \
ewolOObject2DTextured.cpp \ ewol/OObject/2DTextured.cpp \
ewolTexture.cpp ewol/Texture.cpp
ifeq ("$(FREETYPE_CFLAGS)", "") ifeq ("$(FREETYPE_CFLAGS)", "")
CXXFILES += ewolFontBitmap.cpp CXXFILES += ewol/FontBitmap.cpp
else else
CXXFILES += ewolFontFreeType.cpp CXXFILES += ewol/FontFreeType.cpp
endif endif
CXXFILES += ewolWidget.cpp \ CXXFILES += ewol/Widget.cpp \
ewolWidgetManager.cpp \ ewol/WidgetManager.cpp \
ewolWindows.cpp ewol/Windows.cpp
# list of widgets : # list of widgets :
CXXFILES += widget/ewolButton.cpp \ CXXFILES += ewol/widget/Button.cpp \
widget/ewolCheckBox.cpp \ ewol/widget/CheckBox.cpp \
widget/ewolEntry.cpp \ ewol/widget/Entry.cpp \
widget/ewolList.cpp \ ewol/widget/List.cpp \
widget/ewolSizerHori.cpp \ ewol/widget/SizerHori.cpp \
widget/ewolSizerVert.cpp ewol/widget/SizerVert.cpp
# only to test son internal element ... # only to test son internal element ...
CXXFILES += widget/ewolTest.cpp CXXFILES += ewol/widget/Test.cpp
# Ewol Test Software : # Ewol Test Software :
@ -212,6 +212,8 @@ CXXFILES += Main.cpp
LISTE_MODULES = $(sort $(dir $(CXXFILES))) LISTE_MODULES = $(sort $(dir $(CXXFILES)))
#$(info listeModule=$(LISTE_MODULES)) #$(info listeModule=$(LISTE_MODULES))
INCLUDE_DIRECTORY = $(addprefix -I$(FILE_DIRECTORY)/, $(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 ### ### Build Object Files List ###
@ -240,6 +242,7 @@ build: .encadrer .versionFile $(OUTPUT_NAME)
@echo $(CADRE_HAUT_BAS) @echo $(CADRE_HAUT_BAS)
@mkdir -p $(addprefix $(OBJECT_DIRECTORY)/, $(LISTE_MODULES)) @mkdir -p $(addprefix $(OBJECT_DIRECTORY)/, $(LISTE_MODULES))
.versionFile: .versionFile:
@rm -f $(OBJECT_DIRECTORY)/ewol.o @rm -f $(OBJECT_DIRECTORY)/ewol.o

View File

@ -23,13 +23,13 @@
*/ */
#include <ewol.h> #include <ewol/ewol.h>
#include <ewolFont.h> #include <ewol/Font.h>
#include <widget/ewolButton.h> #include <ewol/widget/Button.h>
#include <widget/ewolCheckBox.h> #include <ewol/widget/CheckBox.h>
#include <widget/ewolSizerHori.h> #include <ewol/widget/SizerHori.h>
#include <widget/ewolSizerVert.h> #include <ewol/widget/SizerVert.h>
#include <widget/ewolTest.h> #include <ewol/widget/Test.h>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>

View File

@ -25,8 +25,8 @@
#include <ewolDebug.h> #include <ewol/Debug.h>
#include <guiAndroid.h> #include <base/guiAndroid.h>
#undef __class__ #undef __class__
#define __class__ "guiAbstraction" #define __class__ "guiAbstraction"

View File

@ -26,7 +26,7 @@
#ifndef __GUI_ABSTRACTION_H__ #ifndef __GUI_ABSTRACTION_H__
#define __GUI_ABSTRACTION_H__ #define __GUI_ABSTRACTION_H__
#include <etkTypes.h> #include <etk/Types.h>
namespace guiAbstraction namespace guiAbstraction
{ {

View File

@ -23,8 +23,8 @@
*/ */
#include <ewolDebug.h> #include <ewol/Debug.h>
#include <guiDoubleBuffer.h> #include <base/guiDoubleBuffer.h>
#undef __class__ #undef __class__
#define __class__ "guiAbstraction" #define __class__ "guiAbstraction"

View File

@ -26,7 +26,7 @@
#ifndef __GUI_ABSTRACTION_H__ #ifndef __GUI_ABSTRACTION_H__
#define __GUI_ABSTRACTION_H__ #define __GUI_ABSTRACTION_H__
#include <etkTypes.h> #include <etk/Types.h>
namespace guiAbstraction namespace guiAbstraction
{ {

View File

@ -23,8 +23,8 @@
*/ */
#include <ewolDebug.h> #include <ewol/Debug.h>
#include <guiIPhone.h> #include <base/guiIPhone.h>
#undef __class__ #undef __class__
#define __class__ "guiAbstraction" #define __class__ "guiAbstraction"

View File

@ -26,7 +26,7 @@
#ifndef __GUI_ABSTRACTION_H__ #ifndef __GUI_ABSTRACTION_H__
#define __GUI_ABSTRACTION_H__ #define __GUI_ABSTRACTION_H__
#include <etkTypes.h> #include <etk/Types.h>
namespace guiAbstraction namespace guiAbstraction
{ {

View File

@ -23,10 +23,10 @@
*/ */
#include <ewolDebug.h> #include <ewol/Debug.h>
#include <etkString.h> #include <etk/String.h>
#include <ewolWidgetManager.h> #include <ewol/WidgetManager.h>
#include <guiX11.h> #include <base/guiX11.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>

View File

@ -26,8 +26,8 @@
#ifndef __GUI_ABSTRACTION_H__ #ifndef __GUI_ABSTRACTION_H__
#define __GUI_ABSTRACTION_H__ #define __GUI_ABSTRACTION_H__
#include <etkTypes.h> #include <etk/Types.h>
#include <ewolWindows.h> #include <ewol/Windows.h>
namespace guiAbstraction namespace guiAbstraction
{ {

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file etkDebug.h * @file etk/Debug.h
* @brief Ewol Tool Kit : log implementation * @brief Ewol Tool Kit : log implementation
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 08/06/2010 * @date 08/06/2010
@ -22,7 +22,7 @@
******************************************************************************* *******************************************************************************
*/ */
#include <etkDebug.h> #include <etk/Debug.h>
#include <time.h> #include <time.h>
// Max string size : (wide screan console nb caractere) // Max string size : (wide screan console nb caractere)

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file etkDebug.h * @file etk/Debug.h
* @brief Ewol Tool Kit : log implementation * @brief Ewol Tool Kit : log implementation
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 08/06/2010 * @date 08/06/2010
@ -26,7 +26,7 @@
#define __ETK_DEBUG_H__ #define __ETK_DEBUG_H__
#include <iostream> #include <iostream>
#include <etkTypes.h> #include <etk/Types.h>
// Log Message System For EDN // Log Message System For EDN
void TOOLS_DisplayFuncName(int32_t ligne, const char* className, const char* funcName, const char* libName); void TOOLS_DisplayFuncName(int32_t ligne, const char* className, const char* funcName, const char* libName);

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file etkDebugInternal.cpp * @file etk/DebugInternal.cpp
* @brief Ewol Tool Kit : log wrapper (sources) * @brief Ewol Tool Kit : log wrapper (sources)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 19/10/2011 * @date 19/10/2011

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file etkDebugInternal.h * @file etk/DebugInternal.h
* @brief Ewol Tool Kit : log wrapper (header) * @brief Ewol Tool Kit : log wrapper (header)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 19/10/2011 * @date 19/10/2011
@ -25,7 +25,7 @@
#ifndef __ETK_DEBUG_INTERNAL_H__ #ifndef __ETK_DEBUG_INTERNAL_H__
#define __ETK_DEBUG_INTERNAL_H__ #define __ETK_DEBUG_INTERNAL_H__
#include "etkDebug.h" #include "etk/Debug.h"
extern const char * etkLibName; extern const char * etkLibName;

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file etkFile.cpp * @file etk/File.cpp
* @brief Ewol Tool Kit : File folder and name abstraction (Sources) * @brief Ewol Tool Kit : File folder and name abstraction (Sources)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 16/07/2011 * @date 16/07/2011
@ -23,9 +23,9 @@
*/ */
#include <etkTypes.h> #include <etk/Types.h>
#include <etkDebugInternal.h> #include <etk/DebugInternal.h>
#include <etkFile.h> #include <etk/File.h>
#undef __class__ #undef __class__

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file etkFile.h * @file etk/File.h
* @brief Ewol Tool Kit : File folder and name abstraction (header) * @brief Ewol Tool Kit : File folder and name abstraction (header)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 16/07/2011 * @date 16/07/2011
@ -25,7 +25,7 @@
#ifndef __ETK_FILE_H__ #ifndef __ETK_FILE_H__
#define __ETK_FILE_H__ #define __ETK_FILE_H__
#include <etkString.h> #include <etk/String.h>
#define MAX_FILE_NAME (10240) #define MAX_FILE_NAME (10240)

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file etkMemory.cpp * @file etk/Memory.cpp
* @brief Ewol Tool Kit : Memory implementation (Sources) * @brief Ewol Tool Kit : Memory implementation (Sources)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 19/10/2011 * @date 19/10/2011
@ -22,8 +22,8 @@
******************************************************************************* *******************************************************************************
*/ */
#include <etkTypes.h> #include <etk/Types.h>
#include <etkMemory.h> #include <etk/Memory.h>
// General // General
#if ETK_MEMORY_CHECKER > 0 #if ETK_MEMORY_CHECKER > 0

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file etkMemory.h * @file etk/Memory.h
* @brief Ewol Tool Kit : Memory implementation (headers) * @brief Ewol Tool Kit : Memory implementation (headers)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 12/01/2011 * @date 12/01/2011

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file etkExp.cpp * @file etk/RegExp.cpp
* @brief Ewol Tool Kit : Regular expression annalyser (sources) * @brief Ewol Tool Kit : Regular expression annalyser (sources)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 04/04/2011 * @date 04/04/2011
@ -22,7 +22,7 @@
******************************************************************************* *******************************************************************************
*/ */
#include <etkRegExp.h> #include <etk/RegExp.h>

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file etkExp.h * @file etk/RegExp.h
* @brief Ewol Tool Kit : Regular expression annalyser (header) * @brief Ewol Tool Kit : Regular expression annalyser (header)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 04/04/2011 * @date 04/04/2011
@ -25,11 +25,11 @@
#ifndef __TK_REG_EXP_H__ #ifndef __TK_REG_EXP_H__
#define __TK_REG_EXP_H__ #define __TK_REG_EXP_H__
#include <etkTypes.h> #include <etk/Types.h>
#include <etkDebugInternal.h> #include <etk/DebugInternal.h>
#include <etkMemory.h> #include <etk/Memory.h>
#include <etkString.h> #include <etk/String.h>
#include <etkVectorType.h> #include <etk/VectorType.h>
namespace etk { namespace etk {

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file etkSingleton.h * @file etk/Singleton.h
* @brief ewol : singleton system class * @brief ewol : singleton system class
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 04/12/2010 * @date 04/12/2010

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file etkString.cpp * @file etk/String.cpp
* @brief Ewol Tool Kit : normal sting management... (sources) * @brief Ewol Tool Kit : normal sting management... (sources)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 26/01/2011 * @date 26/01/2011
@ -22,8 +22,8 @@
******************************************************************************* *******************************************************************************
*/ */
#include <etkString.h> #include <etk/String.h>
#include <etkMemory.h> #include <etk/Memory.h>
#undef __class__ #undef __class__

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file etkString.h * @file etk/String.h
* @brief Ewol Tool Kit : normal sting management... (header) * @brief Ewol Tool Kit : normal sting management... (header)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 26/01/2011 * @date 26/01/2011
@ -26,7 +26,7 @@
#define __ETK_STRING_H__ #define __ETK_STRING_H__
#include <iostream> #include <iostream>
#include <etkVectorType.h> #include <etk/VectorType.h>
namespace etk namespace etk
{ {

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file etkTypes.h * @file etk/Types.h
* @brief Ewol Tool Kit : generique define type * @brief Ewol Tool Kit : generique define type
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 08/06/2010 * @date 08/06/2010

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file etkVector.h * @file etk/Vector.h
* @brief Ewol Tool Kit : Basic etk::Vector (template) * @brief Ewol Tool Kit : Basic etk::Vector (template)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 07/04/2011 * @date 07/04/2011
@ -25,8 +25,8 @@
#ifndef __ETK_VECTOR_H__ #ifndef __ETK_VECTOR_H__
#define __ETK_VECTOR_H__ #define __ETK_VECTOR_H__
#include <etkType.h> #include <etk/Type.h>
#include <etkMemory.h> #include <etk/Memory.h>
#undef __class__ #undef __class__
#define __class__ "etk::Vector" #define __class__ "etk::Vector"

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file etkVectorType.h * @file etk/VectorType.h
* @brief Ewol Tool Kit : Basic VectorType for direct data insertion (template) * @brief Ewol Tool Kit : Basic VectorType for direct data insertion (template)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 07/04/2011 * @date 07/04/2011
@ -25,9 +25,9 @@
#ifndef __ETK_VECTOR_TYPE_H__ #ifndef __ETK_VECTOR_TYPE_H__
#define __ETK_VECTOR_TYPE_H__ #define __ETK_VECTOR_TYPE_H__
#include <etkTypes.h> #include <etk/Types.h>
#include <etkDebugInternal.h> #include <etk/DebugInternal.h>
#include <etkMemory.h> #include <etk/Memory.h>
#undef __class__ #undef __class__
#define __class__ "etk::VectorType" #define __class__ "etk::VectorType"

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolDebug.h * @file ewol/Debug.h
* @brief Ewol : log wrapper (Sources) * @brief Ewol : log wrapper (Sources)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 19/10/2010 * @date 19/10/2010
@ -23,6 +23,6 @@
*/ */
#include <ewolDebug.h> #include <ewol/Debug.h>
const char * ewolLibName = "ewol "; const char * ewolLibName = "ewol ";

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolDebug.h * @file ewol/Debug.h
* @brief Ewol : log wrapper (header) * @brief Ewol : log wrapper (header)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 19/10/2010 * @date 19/10/2010
@ -25,8 +25,8 @@
#ifndef __EWOL_DEBUG_H__ #ifndef __EWOL_DEBUG_H__
#define __EWOL_DEBUG_H__ #define __EWOL_DEBUG_H__
#include <etkTypes.h> #include <etk/Types.h>
#include <etkDebug.h> #include <etk/Debug.h>
extern const char * ewolLibName; extern const char * ewolLibName;

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolFont.h * @file ewol/Font.h
* @brief ewol Font system (header) * @brief ewol Font system (header)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 29/10/2011 * @date 29/10/2011
@ -25,9 +25,9 @@
#ifndef __EWOL_FONT_H__ #ifndef __EWOL_FONT_H__
#define __EWOL_FONT_H__ #define __EWOL_FONT_H__
#include <etkTypes.h> #include <etk/Types.h>
#include <ewolDebug.h> #include <ewol/Debug.h>
#include <etkFile.h> #include <etk/File.h>
namespace ewol namespace ewol

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolFontBitmap.cpp * @file ewol/FontBitmap.cpp
* @brief ewol Font system (sources) * @brief ewol Font system (sources)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 29/10/2011 * @date 29/10/2011
@ -23,9 +23,9 @@
*/ */
#include <ewolFont.h> #include <ewol/Font.h>
#include <ewolTexture.h> #include <ewol/Texture.h>
#include <etkVectorType.h> #include <etk/VectorType.h>
#include <GL/gl.h> #include <GL/gl.h>

View File

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

View File

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

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolOObject.h * @file ewol/OObject.h
* @brief ewol OpenGl Object system (header) * @brief ewol OpenGl Object system (header)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 24/10/2011 * @date 24/10/2011
@ -25,11 +25,11 @@
#ifndef __EWOL_O_OBJECT_H__ #ifndef __EWOL_O_OBJECT_H__
#define __EWOL_O_OBJECT_H__ #define __EWOL_O_OBJECT_H__
#include <etkTypes.h> #include <etk/Types.h>
#include <etkFile.h> #include <etk/File.h>
#include <ewolDebug.h> #include <ewol/Debug.h>
#include <ewolFont.h> #include <ewol/Font.h>
#include <etkVectorType.h> #include <etk/VectorType.h>
namespace ewol { namespace ewol {
extern "C" { extern "C" {
@ -78,7 +78,7 @@ namespace ewol {
#endif #endif
#include <ewolOObject2DTextured.h> #include <ewol/OObject/2DTextured.h>
#include <ewolOObject2DColored.h> #include <ewol/OObject/2DColored.h>
#include <ewolOObject2DText.h> #include <ewol/OObject/2DText.h>

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolOObject2DColored.cpp * @file ewol/OObject/2DColored.cpp
* @brief ewol OpenGl Object system (Sources) * @brief ewol OpenGl Object system (Sources)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 09/11/2011 * @date 09/11/2011
@ -22,7 +22,7 @@
******************************************************************************* *******************************************************************************
*/ */
#include <ewolOObject2DColored.h> #include <ewol/OObject/2DColored.h>
#include <GL/gl.h> #include <GL/gl.h>
#include <math.h> #include <math.h>

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolOObject2DColored.h * @file ewol/OObject/2DColored.h
* @brief ewol OpenGl Object system (header) * @brief ewol OpenGl Object system (header)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 09/11/2011 * @date 09/11/2011
@ -25,7 +25,7 @@
#ifndef __EWOL_O_OBJECT_2D_COLORED_H__ #ifndef __EWOL_O_OBJECT_2D_COLORED_H__
#define __EWOL_O_OBJECT_2D_COLORED_H__ #define __EWOL_O_OBJECT_2D_COLORED_H__
#include <ewolOObject.h> #include <ewol/OObject.h>
namespace ewol { namespace ewol {
class OObject2DColored :public ewol::OObject class OObject2DColored :public ewol::OObject

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolOObject2DText.cpp * @file ewol/OObject/2DText.cpp
* @brief ewol OpenGl Object system (Sources) * @brief ewol OpenGl Object system (Sources)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 09/11/2011 * @date 09/11/2011
@ -22,7 +22,7 @@
******************************************************************************* *******************************************************************************
*/ */
#include <ewolOObject2DText.h> #include <ewol/OObject/2DText.h>
#include <GL/gl.h> #include <GL/gl.h>
#undef __class__ #undef __class__

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolOObject2DText.h * @file ewol/OObject/2DText.h
* @brief ewol OpenGl Object system (header) * @brief ewol OpenGl Object system (header)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 09/11/2011 * @date 09/11/2011
@ -25,7 +25,7 @@
#ifndef __EWOL_O_OBJECT_2D_TEXT_H__ #ifndef __EWOL_O_OBJECT_2D_TEXT_H__
#define __EWOL_O_OBJECT_2D_TEXT_H__ #define __EWOL_O_OBJECT_2D_TEXT_H__
#include <ewolOObject.h> #include <ewol/OObject.h>
namespace ewol { namespace ewol {
class OObject2DText :public ewol::OObject class OObject2DText :public ewol::OObject

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolOObject2DTextured.cpp * @file ewol/OObject/2DTextured.cpp
* @brief ewol OpenGl Object system (Sources) * @brief ewol OpenGl Object system (Sources)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 09/11/2011 * @date 09/11/2011
@ -22,8 +22,8 @@
******************************************************************************* *******************************************************************************
*/ */
#include <ewolOObject2DTextured.h> #include <ewol/OObject/2DTextured.h>
#include <ewolTexture.h> #include <ewol/Texture.h>
#include <GL/gl.h> #include <GL/gl.h>
#undef __class__ #undef __class__

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolOObject2DTextured.h * @file ewol/OObject/2DTextured.h
* @brief ewol OpenGl Object system (header) * @brief ewol OpenGl Object system (header)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 09/11/2011 * @date 09/11/2011
@ -25,7 +25,7 @@
#ifndef __EWOL_O_OBJECT_2D_TEXTURED_H__ #ifndef __EWOL_O_OBJECT_2D_TEXTURED_H__
#define __EWOL_O_OBJECT_2D_TEXTURED_H__ #define __EWOL_O_OBJECT_2D_TEXTURED_H__
#include <ewolOObject.h> #include <ewol/OObject.h>
namespace ewol { namespace ewol {
class OObject2DTextured :public ewol::OObject class OObject2DTextured :public ewol::OObject

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolTexture.cpp * @file ewol/Texture.cpp
* @brief ewol Texture loading system (sources) * @brief ewol Texture loading system (sources)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 28/10/2011 * @date 28/10/2011
@ -24,7 +24,7 @@
#include <ewolTexture.h> #include <ewol/Texture.h>
extern "C" extern "C"
{ {

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolTexture.h * @file ewol/Texture.h
* @brief ewol Texture loading system (header) * @brief ewol Texture loading system (header)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 28/10/2011 * @date 28/10/2011
@ -25,9 +25,9 @@
#ifndef __EWOL_TEXTURE_H__ #ifndef __EWOL_TEXTURE_H__
#define __EWOL_TEXTURE_H__ #define __EWOL_TEXTURE_H__
#include <etkTypes.h> #include <etk/Types.h>
#include <ewolDebug.h> #include <ewol/Debug.h>
#include <etkFile.h> #include <etk/File.h>
namespace ewol namespace ewol
{ {

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolWidget.cpp * @file ewol/Widget.cpp
* @brief basic ewol Widget (Sources) * @brief basic ewol Widget (Sources)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 18/10/2011 * @date 18/10/2011
@ -22,8 +22,8 @@
******************************************************************************* *******************************************************************************
*/ */
#include <ewolWidget.h> #include <ewol/Widget.h>
#include <ewolWidgetManager.h> #include <ewol/WidgetManager.h>
#undef __class__ #undef __class__
#define __class__ "ewol::Widget" #define __class__ "ewol::Widget"

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolWidget.h * @file ewol/Widget.h
* @brief basic ewol Widget (header) * @brief basic ewol Widget (header)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 18/10/2011 * @date 18/10/2011
@ -25,10 +25,10 @@
#ifndef __EWOL_WIDGET_H__ #ifndef __EWOL_WIDGET_H__
#define __EWOL_WIDGET_H__ #define __EWOL_WIDGET_H__
#include <etkTypes.h> #include <etk/Types.h>
#include <ewolDebug.h> #include <ewol/Debug.h>
#include <ewolOObject.h> #include <ewol/OObject.h>
#include <etkVectorType.h> #include <etk/VectorType.h>
namespace ewol { namespace ewol {
extern "C" { extern "C" {

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolWidgetManager.cpp * @file ewol/WidgetManager.cpp
* @brief basic ewol Widget Manager (Sources) * @brief basic ewol Widget Manager (Sources)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 13/11/2011 * @date 13/11/2011
@ -22,7 +22,7 @@
******************************************************************************* *******************************************************************************
*/ */
#include <ewolWidgetManager.h> #include <ewol/WidgetManager.h>
#undef __class__ #undef __class__
#define __class__ "ewol::WidgetManager" #define __class__ "ewol::WidgetManager"

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolWidgetManager.h * @file ewol/WidgetManager.h
* @brief basic ewol Widget Manager (Header) * @brief basic ewol Widget Manager (Header)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 13/11/2011 * @date 13/11/2011
@ -25,11 +25,11 @@
#ifndef __EWOL_WIDGET_MANAGER_H__ #ifndef __EWOL_WIDGET_MANAGER_H__
#define __EWOL_WIDGET_MANAGER_H__ #define __EWOL_WIDGET_MANAGER_H__
#include <etkTypes.h> #include <etk/Types.h>
#include <ewolDebug.h> #include <ewol/Debug.h>
#include <ewolOObject.h> #include <ewol/OObject.h>
#include <etkVectorType.h> #include <etk/VectorType.h>
#include <ewolWidget.h> #include <ewol/Widget.h>
namespace ewol { namespace ewol {
namespace widgetManager { namespace widgetManager {

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolWindows.cpp * @file ewol/Windows.cpp
* @brief ewol window system (sources) * @brief ewol window system (sources)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 20/10/2011 * @date 20/10/2011
@ -22,14 +22,14 @@
******************************************************************************* *******************************************************************************
*/ */
#include <etkTypes.h> #include <etk/Types.h>
#include <etkString.h> #include <etk/String.h>
#include <ewolWidget.h> #include <ewol/Widget.h>
#include <ewolWindows.h> #include <ewol/Windows.h>
#include <ewolOObject.h> #include <ewol/OObject.h>
#include <ewolTexture.h> #include <ewol/Texture.h>
#include <ewolFont.h> #include <ewol/Font.h>
#include <ewol.h> #include <ewol/ewol.h>
#include <GL/gl.h> #include <GL/gl.h>

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolWindows.h * @file ewol/Windows.h
* @brief ewol window system (header) * @brief ewol window system (header)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 20/10/2011 * @date 20/10/2011
@ -25,11 +25,11 @@
#ifndef __EWOL_WINDOWS_H__ #ifndef __EWOL_WINDOWS_H__
#define __EWOL_WINDOWS_H__ #define __EWOL_WINDOWS_H__
#include <etkTypes.h> #include <etk/Types.h>
#include <ewolDebug.h> #include <ewol/Debug.h>
#include <etkVectorType.h> #include <etk/VectorType.h>
#include <etkSingleton.h> #include <etk/Singleton.h>
#include <ewolWidget.h> #include <ewol/Widget.h>
namespace ewol { namespace ewol {
class Windows :public ewol::Widget class Windows :public ewol::Widget

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewol.cpp * @file ewol/ewol.cpp
* @brief Main code of ewol (sources) * @brief Main code of ewol (sources)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 17/10/2011 * @date 17/10/2011
@ -23,22 +23,22 @@
*/ */
#include "ewol.h" #include "ewol/ewol.h"
#include "ewolFont.h" #include "ewol/Font.h"
#include "ewolWidgetManager.h" #include "ewol/WidgetManager.h"
#if __PLATFORM__ == X11 #if __PLATFORM__ == X11
#include "guiX11.h" #include "base/guiX11.h"
#elif __PLATFORM__ == DoubleBuffer #elif __PLATFORM__ == DoubleBuffer
#include "guiDoubleBuffer.h" #include "base/guiDoubleBuffer.h"
#elif __PLATFORM__ == Android #elif __PLATFORM__ == Android
#include "guiAndroid.h" #include "base/guiAndroid.h"
#elif __PLATFORM__ == AndroidTablet #elif __PLATFORM__ == AndroidTablet
#include "guiAndroidTablet.h" #include "base/guiAndroidTablet.h"
#elif __PLATFORM__ == IPhone #elif __PLATFORM__ == IPhone
#include "guiIPhone.h" #include "base/guiIPhone.h"
#elif __PLATFORM__ == IPad #elif __PLATFORM__ == IPad
#include "guiIPad.h" #include "base/guiIPad.h"
#else #else
#error you need to specify a platform ... #error you need to specify a platform ...
#endif #endif

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewol.h * @file ewol/ewol.h
* @brief Main include of ewol (header) * @brief Main include of ewol (header)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 17/10/2011 * @date 17/10/2011
@ -26,10 +26,10 @@
#ifndef __EWOL_H__ #ifndef __EWOL_H__
#define __EWOL_H__ #define __EWOL_H__
#include <etkTypes.h> #include <etk/Types.h>
#include <etkString.h> #include <etk/String.h>
#include <ewolWidget.h> #include <ewol/Widget.h>
#include <ewolWindows.h> #include <ewol/Windows.h>
namespace ewol { namespace ewol {
void Init(int32_t argc, char *argv[]); void Init(int32_t argc, char *argv[]);

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolButton.cpp * @file ewol/widget/Button.cpp
* @brief ewol Button widget system (Sources) * @brief ewol Button widget system (Sources)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 07/11/2011 * @date 07/11/2011
@ -22,10 +22,10 @@
******************************************************************************* *******************************************************************************
*/ */
#include <widget/ewolButton.h> #include <ewol/widget/Button.h>
#include <ewolOObject.h> #include <ewol/OObject.h>
#include <ewolWidgetManager.h> #include <ewol/WidgetManager.h>
const char * const ewolEventButtonPressed = "ewol Button Pressed"; const char * const ewolEventButtonPressed = "ewol Button Pressed";

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolButton.h * @file ewol/widget/Button.h
* @brief ewol Button widget system (header) * @brief ewol Button widget system (header)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 07/11/2011 * @date 07/11/2011
@ -25,9 +25,9 @@
#ifndef __EWOL_BUTTON_H__ #ifndef __EWOL_BUTTON_H__
#define __EWOL_BUTTON_H__ #define __EWOL_BUTTON_H__
#include <etkTypes.h> #include <etk/Types.h>
#include <ewolDebug.h> #include <ewol/Debug.h>
#include <ewolWidget.h> #include <ewol/Widget.h>
namespace ewol { namespace ewol {
class Button :public ewol::Widget class Button :public ewol::Widget

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolCheckBox.cpp * @file ewol/widget/CheckBox.cpp
* @brief ewol check-box widget system (Sources) * @brief ewol check-box widget system (Sources)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 07/11/2011 * @date 07/11/2011
@ -23,10 +23,10 @@
*/ */
#include <widget/ewolCheckBox.h> #include <ewol/widget/CheckBox.h>
#include <ewolOObject.h> #include <ewol/OObject.h>
#include <ewolWidgetManager.h> #include <ewol/WidgetManager.h>
const char * ewolEventCheckBoxClicked = "ewol CheckBox Clicked"; const char * ewolEventCheckBoxClicked = "ewol CheckBox Clicked";

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolCheckBox.h * @file ewol/widget/CheckBox.h
* @brief ewol check-box widget system (header) * @brief ewol check-box widget system (header)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 07/11/2011 * @date 07/11/2011
@ -25,9 +25,9 @@
#ifndef __EWOL_CHECK_BOX_H__ #ifndef __EWOL_CHECK_BOX_H__
#define __EWOL_CHECK_BOX_H__ #define __EWOL_CHECK_BOX_H__
#include <etkTypes.h> #include <etk/Types.h>
#include <ewolDebug.h> #include <ewol/Debug.h>
#include <ewolWidget.h> #include <ewol/Widget.h>
namespace ewol { namespace ewol {
class CheckBox :public ewol::Widget class CheckBox :public ewol::Widget

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolEntry.cpp * @file ewol/widget/Entry.cpp
* @brief ewol entry widget system (Sources) * @brief ewol entry widget system (Sources)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 07/11/2011 * @date 07/11/2011
@ -23,7 +23,7 @@
*/ */
#include <widget/ewolEntry.h> #include <ewol/widget/Entry.h>
#undef __class__ #undef __class__
#define __class__ "ewol::Entry" #define __class__ "ewol::Entry"

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolEntry.h * @file ewol/widget/Entry.h
* @brief ewol entry widget system (header) * @brief ewol entry widget system (header)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 07/11/2011 * @date 07/11/2011
@ -25,9 +25,9 @@
#ifndef __EWOL_ENTRY_H__ #ifndef __EWOL_ENTRY_H__
#define __EWOL_ENTRY_H__ #define __EWOL_ENTRY_H__
#include <etkTypes.h> #include <etk/Types.h>
#include <ewolDebug.h> #include <ewol/Debug.h>
#include <ewolWidget.h> #include <ewol/Widget.h>
namespace ewol { namespace ewol {
class Entry :public ewol::Widget class Entry :public ewol::Widget

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolList.cpp * @file ewol/widget/List.cpp
* @brief ewol list widget system (Sources) * @brief ewol list widget system (Sources)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 07/11/2011 * @date 07/11/2011
@ -23,7 +23,7 @@
*/ */
#include <widget/ewolList.h> #include <ewol/widget/List.h>
#undef __class__ #undef __class__
#define __class__ "ewol::List" #define __class__ "ewol::List"

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolList.h * @file ewol/widget/List.h
* @brief ewol list widget system (header) * @brief ewol list widget system (header)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 07/11/2011 * @date 07/11/2011
@ -25,9 +25,9 @@
#ifndef __EWOL_LIST_H__ #ifndef __EWOL_LIST_H__
#define __EWOL_LIST_H__ #define __EWOL_LIST_H__
#include <etkTypes.h> #include <etk/Types.h>
#include <ewolDebug.h> #include <ewol/Debug.h>
#include <ewolWidget.h> #include <ewol/Widget.h>
namespace ewol { namespace ewol {
class List :public ewol::Widget class List :public ewol::Widget

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolSizerHori.cpp * @file ewol/widget/SizerHori.cpp
* @brief ewol hirisantal sizer widget system (Sources) * @brief ewol hirisantal sizer widget system (Sources)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 07/11/2011 * @date 07/11/2011
@ -24,7 +24,7 @@
#include <widget/ewolSizerHori.h> #include <ewol/widget/SizerHori.h>
#undef __class__ #undef __class__
#define __class__ "ewol::SizerHori" #define __class__ "ewol::SizerHori"

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolSizerHori.h * @file ewol/widget/SizerHori.h
* @brief ewol hirisantal sizer widget system (header) * @brief ewol hirisantal sizer widget system (header)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 07/11/2011 * @date 07/11/2011
@ -25,9 +25,9 @@
#ifndef __EWOL_SIZER_HORI_H__ #ifndef __EWOL_SIZER_HORI_H__
#define __EWOL_SIZER_HORI_H__ #define __EWOL_SIZER_HORI_H__
#include <etkTypes.h> #include <etk/Types.h>
#include <ewolDebug.h> #include <ewol/Debug.h>
#include <ewolWidget.h> #include <ewol/Widget.h>
namespace ewol { namespace ewol {
class SizerHori :public ewol::Widget class SizerHori :public ewol::Widget

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolSizerVert.cpp * @file ewol/widget/SizerVert.cpp
* @brief ewol vertical sizer widget system (Sources) * @brief ewol vertical sizer widget system (Sources)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 07/11/2011 * @date 07/11/2011
@ -23,7 +23,7 @@
*/ */
#include <widget/ewolSizerVert.h> #include <ewol/widget/SizerVert.h>
#undef __class__ #undef __class__

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolSizerVert.h * @file ewol/widget/SizerVert.h
* @brief ewol vertical sizer widget system (header) * @brief ewol vertical sizer widget system (header)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 07/11/2011 * @date 07/11/2011
@ -25,9 +25,9 @@
#ifndef __EWOL_SIZER_VERT_H__ #ifndef __EWOL_SIZER_VERT_H__
#define __EWOL_SIZER_VERT_H__ #define __EWOL_SIZER_VERT_H__
#include <etkTypes.h> #include <etk/Types.h>
#include <ewolDebug.h> #include <ewol/Debug.h>
#include <ewolWidget.h> #include <ewol/Widget.h>
namespace ewol { namespace ewol {
class SizerVert :public ewol::Widget class SizerVert :public ewol::Widget

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolTest.cpp * @file ewol/widget/Test.cpp
* @brief ewol Test widget system (Sources) * @brief ewol Test widget system (Sources)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 07/11/2011 * @date 07/11/2011
@ -22,9 +22,9 @@
******************************************************************************* *******************************************************************************
*/ */
#include <widget/ewolTest.h> #include <ewol/widget/Test.h>
#include <ewolOObject.h> #include <ewol/OObject.h>

View File

@ -1,6 +1,6 @@
/** /**
******************************************************************************* *******************************************************************************
* @file ewolTest.h * @file ewol/widget/Test.h
* @brief ewol test widget system (header) * @brief ewol test widget system (header)
* @author Edouard DUPIN * @author Edouard DUPIN
* @date 07/11/2011 * @date 07/11/2011
@ -25,9 +25,9 @@
#ifndef __EWOL_TEST_H__ #ifndef __EWOL_TEST_H__
#define __EWOL_TEST_H__ #define __EWOL_TEST_H__
#include <etkTypes.h> #include <etk/Types.h>
#include <ewolDebug.h> #include <ewol/Debug.h>
#include <ewolWidget.h> #include <ewol/Widget.h>
namespace ewol { namespace ewol {
class Test :public ewol::Widget class Test :public ewol::Widget