simplify makefiles

Build

@@ -1 +1 @@
-Subproject commit af84e9f2ceea7271b67ce0a43c430ca0c26afd89
+Subproject commit 74da51954cb3a9132775271f4569e4720745f37d

Sources/libagg

@@ -1 +1 @@
-Subproject commit 431b3c77f947b1fd23f273f852e6613c8e888bac
+Subproject commit d8531a3a7cc0e873b895246d16db9ad6ef15d93b

Sources/libetk/Android.mk

@@ -13,14 +13,10 @@ LOCAL_C_INCLUDES :=   $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
 ifeq ($(DEBUG),1)
-LOCAL_CFLAGS := -D__PLATFORM__Android \
+LOCAL_CFLAGS := -Wno-write-strings \
-                -Wno-write-strings \
-                -DETK_DEBUG_LEVEL=3 \
                 -Wall
 else
-LOCAL_CFLAGS := -D__PLATFORM__Android \
+LOCAL_CFLAGS := -Wno-write-strings \
-                -Wno-write-strings \
-                -DETK_DEBUG_LEVEL=1 \
                 -DMODE_RELEASE
 endif
 

Sources/libetk/Linux.mk

@@ -8,14 +8,10 @@ LOCAL_STATIC_LIBRARIES := libzip
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
 ifeq ($(DEBUG),1)
-LOCAL_CFLAGS := -D__PLATFORM__Linux \
+LOCAL_CFLAGS := -Wno-write-strings \
-                -Wno-write-strings \
-                -DETK_DEBUG_LEVEL=3 \
                 -Wall
 else
-LOCAL_CFLAGS := -D__PLATFORM__Linux \
+LOCAL_CFLAGS := -Wno-write-strings \
-                -Wno-write-strings \
-                -DETK_DEBUG_LEVEL=1 \
                 -DMODE_RELEASE
 endif
 

Sources/libetk/etk/Debug.cpp

@@ -58,7 +58,7 @@ void TOOLS_DisplayFuncName(int32_t ligne, const char* className, const char* fun
 void TOOLS_DisplayTime(void)
 {
 	char tmpdata[50];
-#ifdef __PLATFORM__Android
+#ifdef __TARGET_OS__Android
 	struct timeval  now;
 	gettimeofday(&now, NULL);
 	sprintf(tmpdata, " %2dh %2dmin %2ds | ", (int32_t)(now.tv_sec/3600)%24, (int32_t)(now.tv_sec/60)%60, (int32_t)(now.tv_sec%60));
@@ -73,7 +73,7 @@ void TOOLS_DisplayTime(void)
 }
 
 
-#ifdef __PLATFORM__Android
+#ifdef __TARGET_OS__Android
 etk::logLevel_te g_requestedLevel = etk::LOG_LEVEL_VERBOSE;
 #else
 etk::logLevel_te g_requestedLevel = etk::LOG_LEVEL_ERROR;

Sources/libetk/etk/Debug.h

@@ -48,24 +48,55 @@ void GeneralDebugSetLevel(etk::logLevel_te ccc);
 															etk::cout <<etk::endl; \
 														} \
 													}while(0)
+
+
 #define ETK_CRITICAL(libName, data)					ETK_DBG_COMMON(libName, etk::LOG_LEVEL_CRITICAL, data)
-#define ETK_ERROR(libName, data)					ETK_DBG_COMMON(libName, etk::LOG_LEVEL_ERROR, data)
+
-#define ETK_WARNING(libName, data)					ETK_DBG_COMMON(libName, etk::LOG_LEVEL_WARNING, data)
+#if DEBUG_LEVEL > 0
-#define ETK_INFO(libName, data)						ETK_DBG_COMMON(libName, etk::LOG_LEVEL_INFO, data)
+#	define ETK_WARNING(libName, data)				ETK_DBG_COMMON(libName, etk::LOG_LEVEL_WARNING, data)
-#define ETK_DEBUG(libName, data)					ETK_DBG_COMMON(libName, etk::LOG_LEVEL_DEBUG, data)
+#	define ETK_ERROR(libName, data)					ETK_DBG_COMMON(libName, etk::LOG_LEVEL_ERROR, data)
-#define ETK_VERBOSE(libName, data)					ETK_DBG_COMMON(libName, etk::LOG_LEVEL_VERBOSE, data)
+#else
+#	define ETK_WARNING(libName, data)				do {}while(0)
+#	define ETK_ERROR(libName, data)					do {}while(0)
+#endif
+
+#if DEBUG_LEVEL > 1
+#	define ETK_INFO(libName, data)					ETK_DBG_COMMON(libName, etk::LOG_LEVEL_INFO, data)
+#else
+#	define ETK_INFO(libName, data)					do {}while(0)
+#endif
+
+#if DEBUG_LEVEL > 2
+#	define ETK_DEBUG(libName, data)					ETK_DBG_COMMON(libName, etk::LOG_LEVEL_DEBUG, data)
+#else
+#	define ETK_DEBUG(libName, data)					do {}while(0)
+#endif
+
+#if DEBUG_LEVEL > 3
+#	define ETK_VERBOSE(libName, data)				ETK_DBG_COMMON(libName, etk::LOG_LEVEL_VERBOSE, data)
+#else
+#	define ETK_VERBOSE(libName, data)				do {}while(0)
+#endif
+
 #define ETK_ASSERT(libName, cond, data)				do { \
 														if (!(cond)) { \
 															ETK_CRITICAL(libName, data); \
 															assert(!#cond); \
 														} \
 													} while (0)
-#define ETK_CHECK_INOUT_ASSERT(libName, cond)		ETK_ASSERT(libName, (cond), "Internal input error : "#cond)
+
-#define ETK_CHECK_INOUT_WARNING(libName, cond)		do { \
+#if DEBUG_LEVEL > 1
+#   define ETK_CHECK_INOUT(libName, cond)			ETK_ASSERT(libName, (cond), "Internal input error : "#cond)
+#elif DEBUG_LEVEL > 0
+#   define ETK_CHECK_INOUT(libName, cond)			do { \
 														if (!(cond)) { \
 															ETK_CRITICAL(libName, "Internal input error : "#cond); \
 														} \
 													} while (0)
-#define ETK_CHECK_MAGIC(libName, cond)				ETK_ASSERT(libName, (cond), "MAGIC check error : "#cond)
+#else
+#   define ETK_CHECK_INOUT(libName, cond)			do { } while (0)
+#endif
+
+#define ETK_TODO(libName, data)						ETK_INFO(libName, "TODO : " << data)
 
 #endif

Sources/libetk/etk/DebugInternal.h

@@ -30,42 +30,14 @@
 extern const char * etkLibName;
 
 #define TK_CRITICAL(data)			ETK_CRITICAL(etkLibName, data)
-// General 
+#define TK_WARNING(data)			ETK_WARNING(etkLibName, data)
-#if ETK_DEBUG_LEVEL > 0
+#define TK_ERROR(data)				ETK_ERROR(etkLibName, data)
-#	define TK_WARNING(data)			ETK_WARNING(etkLibName, data)
+#define TK_INFO(data)				ETK_INFO(etkLibName, data)
-#	define TK_ERROR(data)			ETK_ERROR(etkLibName, data)
+#define TK_DEBUG(data)				ETK_DEBUG(etkLibName, data)
-#else
+#define TK_VERBOSE(data)			ETK_VERBOSE(etkLibName, data)
-#	define TK_WARNING(data)			do {}while(0)
-#	define TK_ERROR(data)			do {}while(0)
-#endif
-
-#if ETK_DEBUG_LEVEL > 1
-#	define TK_INFO(data)			ETK_INFO(etkLibName, data)
-#else
-#	define TK_INFO(data)			do {}while(0)
-#endif
-
-#if ETK_DEBUG_LEVEL > 2
-#	define TK_DEBUG(data)			ETK_DEBUG(etkLibName, data)
-#else
-#	define TK_DEBUG(data)			do {}while(0)
-#endif
-
-#if ETK_DEBUG_LEVEL > 3
-#	define TK_VERBOSE(data)			ETK_VERBOSE(etkLibName, data)
-#else
-#	define TK_VERBOSE(data)			do {}while(0)
-#endif
-
 #define TK_ASSERT(cond, data)		ETK_ASSERT(etkLibName, cond, data)
-
+#define TK_CHECK_INOUT(cond)		ETK_CHECK_INOUT(etkLibName, cond)
-#if ETK_DEBUG_LEVEL > 1
+#define TK_TODO(cond)				ETK_TODO(etkLibName, cond)
-#   define TK_CHECK_INOUT(cond)		ETK_CHECK_INOUT_ASSERT(etkLibName, cond)
-#elif ETK_DEBUG_LEVEL > 0
-#   define TK_CHECK_INOUT(cond)		ETK_CHECK_INOUT_WARNING(etkLibName, cond)
-#else
-#   define TK_CHECK_INOUT(cond)		do { } while (0)
-#endif
 
 #endif
 

Sources/libetk/etk/File.cpp

@@ -29,7 +29,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#ifdef __PLATFORM__Android
+#ifdef __TARGET_OS__Android
 #	include <stdio.h>
 #	include <zip/zip.h>
 #endif
@@ -37,7 +37,7 @@
 // zip file of the apk file for Android ==> set to zip file apk access
 static etk::UString s_fileAPK = "";
 etk::UString baseApplName = "ewolNoName";
-#ifdef __PLATFORM__Android
+#ifdef __TARGET_OS__Android
 	etk::UString baseFolderHome     = "/sdcard/";                  // home folder
 	etk::UString baseFolderData     = "assets/";            // program Data
 	etk::UString baseFolderDataUser = "/sdcard/.tmp/userData/";   // Data specific user (local modification)
@@ -50,7 +50,7 @@ etk::UString baseApplName = "ewolNoName";
 #endif
 
 
-#ifdef __PLATFORM__Android
+#ifdef __TARGET_OS__Android
 	static struct zip * s_APKArchive = NULL;
 	static int32_t      s_APKnbFiles = 0;
 	static void loadAPK(etk::UString& apkPath)
@@ -75,7 +75,7 @@ etk::UString baseApplName = "ewolNoName";
 // for specific device contraint : 
 void etk::SetBaseFolderData(const char * folder)
 {
-	#ifdef __PLATFORM__Android
+	#ifdef __TARGET_OS__Android
 		baseFolderData = "assets/";
 		s_fileAPK = folder;
 		loadAPK(s_fileAPK);
@@ -86,7 +86,7 @@ void etk::SetBaseFolderData(const char * folder)
 
 void etk::SetBaseFolderDataUser(const char * folder)
 {
-	#ifdef __PLATFORM__Android
+	#ifdef __TARGET_OS__Android
 		baseFolderDataUser = folder;
 	#else
 		TK_ERROR("Not Availlable Outside Android");
@@ -95,7 +95,7 @@ void etk::SetBaseFolderDataUser(const char * folder)
 
 void etk::SetBaseFolderCache(const char * folder)
 {
-	#ifdef __PLATFORM__Android
+	#ifdef __TARGET_OS__Android
 		baseFolderCache = folder;
 	#else
 		TK_ERROR("Not Availlable Outside Android");
@@ -113,7 +113,7 @@ void etk::InitDefaultFolder(const char * applName)
 	} else {
 		baseFolderHome = basicPath;
 	}
-	#ifndef __PLATFORM__Android
+	#ifndef __TARGET_OS__Android
 		
 		#ifdef MODE_RELEASE
 			baseFolderData  = "/usr/share/";
@@ -235,7 +235,7 @@ const etk::File& etk::File::operator= (const etk::File &etkF )
 			TK_ERROR("Missing close the file : \"" << GetCompleateName() << "\"");
 			fClose();
 		}
-		#ifdef __PLATFORM__Android
+		#ifdef __TARGET_OS__Android
 			m_idZipFile = etkF.m_idZipFile;
 			m_zipData = NULL;
 			m_zipDataSize = 0;
@@ -287,7 +287,7 @@ void etk::File::SetCompleateName(etk::UString &newFilename, etk::FileType_te typ
 	char buf[MAX_FILE_NAME];
 	memset(buf, 0, MAX_FILE_NAME);
 	char * ok;
-	#ifdef __PLATFORM__Android
+	#ifdef __TARGET_OS__Android
 	m_idZipFile = -1;
 	m_zipData = NULL;
 	m_zipDataSize = 0;
@@ -339,10 +339,10 @@ void etk::File::SetCompleateName(etk::UString &newFilename, etk::FileType_te typ
 	{
 		case etk::FILE_TYPE_DATA:
 			{
-				#if ETK_DEBUG_LEVEL > 3
+				#if DEBUG_LEVEL > 3
 				mode = "FILE_TYPE_DATA";
 				#endif
-				#ifdef __PLATFORM__Android
+				#ifdef __TARGET_OS__Android
 					etk::UString tmpFilename = baseFolderData + destFilename;
 					for (int iii=0; iii<s_APKnbFiles; iii++) {
 						const char* name = zip_get_name(s_APKArchive, iii, 0);
@@ -368,7 +368,7 @@ void etk::File::SetCompleateName(etk::UString &newFilename, etk::FileType_te typ
 			break;
 		case etk::FILE_TYPE_USER_DATA:
 			{
-				#if ETK_DEBUG_LEVEL > 3
+				#if DEBUG_LEVEL > 3
 				mode = "FILE_TYPE_USER_DATA";
 				#endif
 				etk::UString tmpFilename = destFilename;
@@ -379,7 +379,7 @@ void etk::File::SetCompleateName(etk::UString &newFilename, etk::FileType_te typ
 			break;
 		case etk::FILE_TYPE_CACHE:
 			{
-				#if ETK_DEBUG_LEVEL > 3
+				#if DEBUG_LEVEL > 3
 				mode = "FILE_TYPE_CACHE";
 				#endif
 				etk::UString tmpFilename = destFilename;
@@ -390,7 +390,7 @@ void etk::File::SetCompleateName(etk::UString &newFilename, etk::FileType_te typ
 			break;
 		default:
 			// nothing to do ...
-			#if ETK_DEBUG_LEVEL > 3
+			#if DEBUG_LEVEL > 3
 			mode = "FILE_TYPE_DIRECT";
 			#endif
 			needUnpack = true;
@@ -486,7 +486,7 @@ etk::UString etk::File::GetExtention(void)
 	return tmpExt;
 }
 
-#ifdef __PLATFORM__Android
+#ifdef __TARGET_OS__Android
 bool etk::File::LoadDataZip(void)
 {
 	if (NULL != m_zipData) {
@@ -536,7 +536,7 @@ bool etk::File::LoadDataZip(void)
 
 int32_t etk::File::Size(void)
 {
-	#ifdef __PLATFORM__Android
+	#ifdef __TARGET_OS__Android
 	if (etk::FILE_TYPE_DATA == m_type) {
 		if (true == LoadDataZip()) {
 			return m_zipDataSize;
@@ -578,7 +578,7 @@ int32_t etk::File::Size(void)
 
 bool etk::File::Exist(void)
 {
-	#ifdef __PLATFORM__Android
+	#ifdef __TARGET_OS__Android
 	if (etk::FILE_TYPE_DATA == m_type) {
 		if (m_idZipFile >= -1  && m_idZipFile < s_APKnbFiles) {
 			return true;
@@ -617,7 +617,7 @@ bool etk::File::Exist(void)
 
 bool etk::File::fOpenRead(void)
 {
-	#ifdef __PLATFORM__Android
+	#ifdef __TARGET_OS__Android
 	if (etk::FILE_TYPE_DATA == m_type) {
 		return LoadDataZip();
 	}
@@ -653,7 +653,7 @@ bool etk::File::fOpenRead(void)
 
 bool etk::File::fOpenWrite(void)
 {
-	#ifdef __PLATFORM__Android
+	#ifdef __TARGET_OS__Android
 	if (etk::FILE_TYPE_DATA == m_type) {
 		return false;
 	}
@@ -689,7 +689,7 @@ bool etk::File::fOpenWrite(void)
 
 bool etk::File::fClose(void)
 {
-	#ifdef __PLATFORM__Android
+	#ifdef __TARGET_OS__Android
 	if (etk::FILE_TYPE_DATA == m_type) {
 		if (NULL == m_zipData) {
 			TK_CRITICAL("File Already closed : \"" << GetCompleateName() << "\"");
@@ -714,7 +714,7 @@ bool etk::File::fClose(void)
 char * etk::File::fGets(char * elementLine, int32_t maxData)
 {
 	memset(elementLine, 0, maxData);
-	#ifdef __PLATFORM__Android
+	#ifdef __TARGET_OS__Android
 	char * element = elementLine;
 	if (etk::FILE_TYPE_DATA == m_type) {//char * tmpData = internalDataFiles[iii].data + m_readingOffset;
 		if (NULL == m_zipData) {
@@ -751,7 +751,7 @@ char * etk::File::fGets(char * elementLine, int32_t maxData)
 
 int32_t etk::File::fRead(void * data, int32_t blockSize, int32_t nbBlock)
 {
-	#ifdef __PLATFORM__Android
+	#ifdef __TARGET_OS__Android
 	if (etk::FILE_TYPE_DATA == m_type) {
 		if (NULL == m_zipData) {
 			((char*)data)[0] = '\0';
@@ -772,7 +772,7 @@ int32_t etk::File::fRead(void * data, int32_t blockSize, int32_t nbBlock)
 
 int32_t etk::File::fWrite(void * data, int32_t blockSize, int32_t nbBlock)
 {
-	#ifdef __PLATFORM__Android
+	#ifdef __TARGET_OS__Android
 	if (etk::FILE_TYPE_DATA == m_type) {
 		TK_CRITICAL("Can not write on data inside APK : \"" << GetCompleateName() << "\"");
 		return 0;
@@ -784,7 +784,7 @@ int32_t etk::File::fWrite(void * data, int32_t blockSize, int32_t nbBlock)
 
 bool etk::File::fSeek(long int offset, int origin)
 {
-	#ifdef __PLATFORM__Android
+	#ifdef __TARGET_OS__Android
 	if (etk::FILE_TYPE_DATA == m_type) {
 		if (NULL == m_zipData) {
 			return false;
@@ -822,7 +822,7 @@ bool etk::File::fSeek(long int offset, int origin)
 
 char * etk::File::GetDirectPointer(void)
 {
-	#ifdef __PLATFORM__Android
+	#ifdef __TARGET_OS__Android
 	if (etk::FILE_TYPE_DATA == m_type) {
 		if (NULL == m_zipData) {
 			return NULL;

Sources/libetk/etk/File.h

@@ -94,7 +94,7 @@ namespace etk
 		private :
 			etk::FileType_te m_type;
 			FILE *           m_PointerFile;
-			#ifdef __PLATFORM__Android
+			#ifdef __TARGET_OS__Android
 			bool             LoadDataZip(void);
 			int32_t          m_idZipFile;
 			char *           m_zipData;

Sources/libetk/etk/Stream.h

@@ -32,7 +32,7 @@
 #include <pthread.h>
 #include <etk/Types.h>
 
-#if defined(__PLATFORM__Android)
+#if defined(__TARGET_OS__Android)
 #	include <android/log.h>
 #	define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "EWOL", __VA_ARGS__))
 #	define LOGW(...) ((void)__android_log_print(ANDROID_LOG_WARN, "EWOL", __VA_ARGS__))
@@ -238,7 +238,7 @@ namespace etk{
 				strncat(m_tmpChar, ETK_BASH_COLOR_NORMAL, MAX_LOG_SIZE);
 				strncat(m_tmpChar, "\n", MAX_LOG_SIZE);
 				m_tmpChar[MAX_LOG_SIZE] = '\0';
-#if defined(__PLATFORM__Android)
+#if defined(__TARGET_OS__Android)
 				LOGI("%s", m_tmpChar);
 #else
 				printf("%s", m_tmpChar);

Sources/libewol/Android.mk

@@ -18,25 +18,10 @@ LOCAL_C_INCLUDES :=
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_LDLIBS := -lGLESv1_CM -ldl -llog -lz
 
-ifeq ($(DEBUG),1)
+LOCAL_CFLAGS := -Wno-write-strings \
-LOCAL_CFLAGS := -D__PLATFORM__Android \
+                -DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\"" \
-                -Wno-write-strings \
-                -DETK_DEBUG_LEVEL=3 \
-                -DEWOL_DEBUG_LEVEL=3 \
-                -DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-debug\"" \
-                -DBUILD_TIME="\"$(BUILD_TIME)\"" \
                 -DDATA_IN_APK \
                 -DLUA_COMPAT_ALL
-else
-LOCAL_CFLAGS := -D__PLATFORM__Android \
-                -Wno-write-strings \
-                -DETK_DEBUG_LEVEL=1 \
-                -DEWOL_DEBUG_LEVEL=1 \
-                -DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-debug\"" \
-                -DBUILD_TIME="\"$(BUILD_TIME)\"" \
-                -DDATA_IN_APK \
-                -DLUA_COMPAT_ALL
-endif
 
 # load the common sources file of the platform
 include $(LOCAL_PATH)/file.mk

Sources/libewol/Linux.mk

@@ -18,27 +18,11 @@ LOCAL_C_INCLUDES :=
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_LDLIBS := -lGL -lGLU -lz -lX11
 
-ifeq ($(DEBUG),1)
+LOCAL_CFLAGS := -Wno-write-strings \
-LOCAL_CFLAGS := -D__PLATFORM__Linux \
+                -DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\"" \
-                -Wno-write-strings \
-                -DETK_DEBUG_LEVEL=3 \
-                -DEWOL_DEBUG_LEVEL=3 \
-                -DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-debug\"" \
-                -DBUILD_TIME="\"$(BUILD_TIME)\"" \
                 -DLUA_COMPAT_ALL \
                 -Wall
 
-else
-LOCAL_CFLAGS := -D__PLATFORM__Linux \
-                -Wno-write-strings \
-                -DETK_DEBUG_LEVEL=3 \
-                -DEWOL_DEBUG_LEVEL=3 \
-                -DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-release\"" \
-                -DBUILD_TIME="\"$(BUILD_TIME)\"" \
-                -DLUA_COMPAT_ALL
-
-endif
-
 # load the common sources file of the platform
 include $(LOCAL_PATH)/file.mk
 

Sources/libewol/ewol/Audio/audio.cpp

@@ -41,7 +41,7 @@ static int32_t effectsVolumeApply = 1<<16;
 
 static bool isInit = false;
 
-#ifdef __PLATFORM__Linux
+#ifdef __TARGET_OS__Linux
 #	include <ewol/Audio/interfacePortAudio.h>
 #endif
 
@@ -56,7 +56,7 @@ void ewol::audio::Init(void)
 	ewol::audio::music::MuteSet(false);
 	musicFadingTime = 100;
 	isInit = true;
-	#ifdef __PLATFORM__Linux
+	#ifdef __TARGET_OS__Linux
 		ewol::portAudio::Init();
 	#endif
 }
@@ -68,7 +68,7 @@ void ewol::audio::UnInit(void)
 		EWOL_ERROR("multiple un-init requested ... at the audio system ...");
 		return;
 	}
-	#ifdef __PLATFORM__Linux
+	#ifdef __TARGET_OS__Linux
 		ewol::portAudio::UnInit();
 	#endif
 	musicMute = true;

Sources/libewol/ewol/Debug.h

@@ -30,53 +30,15 @@
 
 extern const char * ewolLibName;
 
-#define EWOL_CRITICAL(data)         ETK_CRITICAL(ewolLibName, data)
+#define EWOL_CRITICAL(data)			ETK_CRITICAL(ewolLibName, data)
-// General 
+#define EWOL_WARNING(data)			ETK_WARNING(ewolLibName, data)
-#if EWOL_DEBUG_LEVEL > 0
+#define EWOL_ERROR(data)			ETK_ERROR(ewolLibName, data)
-#	define EWOL_WARNING(data)       ETK_WARNING(ewolLibName, data)
+#define EWOL_INFO(data)				ETK_INFO(ewolLibName, data)
-#	define EWOL_ERROR(data)         ETK_ERROR(ewolLibName, data)
+#define EWOL_DEBUG(data)			ETK_DEBUG(ewolLibName, data)
-#else
+#define EWOL_VERBOSE(data)			ETK_VERBOSE(ewolLibName, data)
-#	define EWOL_WARNING(data)       do {}while(0)
+#define EWOL_ASSERT(cond, data)		ETK_ASSERT(ewolLibName, cond, data)
-#	define EWOL_ERROR(data)         do {}while(0)
+#define EWOL_CHECK_INOUT(cond)		ETK_CHECK_INOUT(ewolLibName, cond)
-#endif
+#define EWOL_TODO(cond)				ETK_TODO(ewolLibName, cond)
-
-#if EWOL_DEBUG_LEVEL > 1
-#	define EWOL_INFO(data)          ETK_INFO(ewolLibName, data)
-#else
-#	define EWOL_INFO(data)          do {}while(0)
-#endif
-
-#if EWOL_DEBUG_LEVEL > 2
-#	define EWOL_DEBUG(data)         ETK_DEBUG(ewolLibName, data)
-#else
-#	define EWOL_DEBUG(data)         do {}while(0)
-#endif
-
-#if EWOL_DEBUG_LEVEL > 3
-#	define EWOL_VERBOSE(data)         ETK_VERBOSE(ewolLibName, data)
-#else
-#	define EWOL_VERBOSE(data)         do {}while(0)
-#endif
-
-#define EWOL_TODO(data)             EWOL_WARNING("TODO : " << data)
-
-#define EWOL_ASSERT(cond, data)     ETK_ASSERT(ewolLibName, cond, data)
-
-#if EWOL_DEBUG_LEVEL > 1
-#	define EWOL_CHECK_INOUT(cond)   ETK_CHECK_INOUT_ASSERT(ewolLibName, cond)
-#elif EWOL_DEBUG_LEVEL > 0
-#	define EWOL_CHECK_INOUT(cond)   ETK_CHECK_INOUT_WARNING(ewolLibName, cond)
-#else
-#	define EWOL_CHECK_INOUT(cond)   do { } while (0)
-#endif
-
-
-// Main define for the check casting of the class in EWOL
-#if EWOL_DEBUG_LEVEL > 2
-#	define EWOL_CAST(eObjectType,eObjectClass,curentPointer)   (NULL==curentPointer) ? NULL : (curentPointer->CheckObjectType(eObjectType)) ? static_cast<eObjectClass*>(curentPointer) : NULL
-#else
-#	define EWOL_CAST(eObjectType,eObjectClass,curentPointer)   static_cast<eObjectClass*>(curentPointer)
-#endif
 
 #endif
 

Sources/libewol/ewol/base/MainThread.cpp

@@ -37,7 +37,7 @@
 #include <ewol/ShortCutManager.h>
 #include <ewol/base/eventInputManagement.h>
 
-#ifdef __PLATFORM__Linux
+#ifdef __TARGET_OS__Linux
 #	include <sched.h>
 #endif
 

Sources/libewol/ewol/importgl.h

@@ -6,21 +6,19 @@
 extern "C" {
 #endif
 
-#if defined(__PLATFORM__Linux)
+#if defined(__TARGET_OS__Linux)
 	#include <GL/gl.h>
 	#include <GL/glu.h>
-#elif defined(__PLATFORM__DoubleBuffer)
+#elif defined(__TARGET_OS__Android)
-	
-#elif defined(__PLATFORM__Android)
 	#include <GLES/gl.h>
-#elif defined(__PLATFORM__AndroidTablet)
+#elif defined(__TARGET_OS__Windows)
-	#include <GLES/gl.h>
-#elif defined(__PLATFORM__IPhone)
 	
-#elif defined(__PLATFORM__IPad)
+#elif defined(__TARGET_OS__MacOs)
+	
+#elif defined(__TARGET_OS__IOs)
 	
 #else
-	#error you need to specify a platform ...
+	#error you need to specify a __TAGET_OS__ ...
 #endif
 
 void glOrthoEwol(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat nearVal, GLfloat farVal);

Sources/libewol/ewol/widget/Button.cpp

@@ -60,7 +60,7 @@ void ewol::Button::Init(void)
 	m_hasAnImage = false;
 	m_alignement = ewol::TEXT_ALIGN_CENTER;
 	
-	#ifdef __PLATFORM__Android
+	#ifdef __TARGET_OS__Android
 		m_padding.y = 12;
 		m_padding.x = 12;
 	#else

Sources/libewol/ewol/widget/ButtonColor.cpp

@@ -54,7 +54,7 @@ void ewol::ButtonColor::Init(void)
 	
 	m_alignement = ewol::TEXT_ALIGN_CENTER;
 	
-	#ifdef __PLATFORM__Android
+	#ifdef __TARGET_OS__Android
 		m_padding.y = 12;
 		m_padding.x = 12;
 	#else

Sources/libewol/ewol/widget/ColorBar.cpp

@@ -39,7 +39,7 @@ ewol::ColorBar::ColorBar(void)
 {
 	AddEventId(ewolEventColorBarChange);
 	
-	#ifdef __PLATFORM__Android
+	#ifdef __TARGET_OS__Android
 		m_padding.y = 12;
 		m_padding.x = 12;
 	#else

Sources/libewol/ewol/widget/Image.cpp

@@ -50,7 +50,7 @@ void ewol::Image::Init(void)
 {
 	AddEventId(ewolEventImagePressed);
 	
-	#ifdef __PLATFORM__Android
+	#ifdef __TARGET_OS__Android
 		m_padding.y = 12;
 		m_padding.x = 12;
 	#else

Sources/libewol/ewol/widget/List.cpp

@@ -35,7 +35,7 @@
 void ewol::List::Init(void)
 {
 	m_paddingSizeX = 2;
-	#ifdef __PLATFORM__Android
+	#ifdef __TARGET_OS__Android
 		m_paddingSizeY = 10;
 	#else
 		m_paddingSizeY = 2;

Sources/libewol/ewol/widgetMeta/FileChooser.cpp

@@ -81,7 +81,7 @@ ewol::FileChooser::FileChooser(void)
 	ewol::Spacer * mySpacer = NULL;
 	//ewol::Label * myLabel = NULL;
 	ewol::Image * myImage = NULL;
-	#ifdef __PLATFORM__Android
+	#ifdef __TARGET_OS__Android
 		m_folder = "/mnt/sdcard/";
 		SetDisplayRatio(0.90);
 	#else

Sources/libewol/ewol/widgetMeta/Parameter.cpp

@@ -54,7 +54,7 @@ ewol::Parameter::Parameter(void) :
 	ewol::SizerVert * mySizerVert = NULL;
 	ewol::SizerHori * mySizerHori = NULL;
 	ewol::Spacer * mySpacer = NULL;
-	#ifdef __PLATFORM__Android
+	#ifdef __TARGET_OS__Android
 		SetDisplayRatio(0.90);
 	#else
 		SetDisplayRatio(0.80);

Sources/libewol/ewol/widgetMeta/ParameterList.cpp

@@ -46,7 +46,7 @@ ewol::ParameterList::ParameterList(void)
 	
 	m_idSelected = -1;
 	m_paddingSizeX = 2;
-	#ifdef __PLATFORM__Android
+	#ifdef __TARGET_OS__Android
 		m_paddingSizeY = 10;
 	#else
 		m_paddingSizeY = 2;

Sources/libfreetype

@@ -1 +1 @@
-Subproject commit 3cce0f240c0ebb26d322f8698c24461b272ccdc6
+Subproject commit 327fc37b923c529f1a8464beb11189e1024524ba

Sources/liblua

@@ -1 +1 @@
-Subproject commit 2d309289f311ef753698f874b9149f71e665075f
+Subproject commit c620bdd5c4d0d42d7f316ccea1623accf56da157

Sources/libogg

@@ -1 +1 @@
-Subproject commit bba4db85c2f4e33e8d04cbd4017bde6c0f78bca2
+Subproject commit a65eac6764ec40d4d61ea25c9c80eb32dcdf33a3

Sources/libparsersvg

@@ -1 +1 @@
-Subproject commit 1e3430bdc3fd5c10b055b5e07e699fa2352ec572
+Subproject commit f2199f4485320e51ee447f7a1b8568d8f6eded4b

Sources/libportaudio

@@ -1 +1 @@
-Subproject commit 794e67bf0f79899c3fe72db0298d3eaba4bc5f16
+Subproject commit e1b5eb9833c6e0e40e7cf9d022d14e0bc7645192

Sources/libtinyxml

@@ -1 +1 @@
-Subproject commit bb39c88b259d0d89d83de1680e7501a48b71b3c5
+Subproject commit 4bce0f4864a83963028215282c02422e448fb554

Sources/libzip

@@ -1 +1 @@
-Subproject commit e4a461eefad2f3614f6ba3fb43e6195014bcabf7
+Subproject commit 8735a891b3d2cea043ae6e0c79890d9950f2a8a8