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

add version number

Browse Source
This commit is contained in:
Edouard DUPIN 2012-07-24 13:02:19 +02:00
parent f088c1667a
commit 5677af8e69
6 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/libewol/Android.mk
View File

@ -24,7 +24,7 @@ LOCAL_CFLAGS := -D__PLATFORM__Android \
-DETK_DEBUG_LEVEL=3 \ -DETK_DEBUG_LEVEL=3 \
-DEWOL_DEBUG_LEVEL=3 \ -DEWOL_DEBUG_LEVEL=3 \
-DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-debug\"" \ -DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-debug\"" \
-DVERSION_BUILD_TIME="\"pasd_heure\"" \ -DBUILD_TIME="\"$(BUILD_TIME)\"" \
-DDATA_IN_APK \ -DDATA_IN_APK \
-DLUA_COMPAT_ALL \ -DLUA_COMPAT_ALL \
-frtti -frtti
@ -34,7 +34,7 @@ LOCAL_CFLAGS := -D__PLATFORM__Android \
-DETK_DEBUG_LEVEL=1 \ -DETK_DEBUG_LEVEL=1 \
-DEWOL_DEBUG_LEVEL=1 \ -DEWOL_DEBUG_LEVEL=1 \
-DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-debug\"" \ -DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-debug\"" \
-DVERSION_BUILD_TIME="\"pasd_heure\"" \ -DBUILD_TIME="\"$(BUILD_TIME)\"" \
-DDATA_IN_APK \ -DDATA_IN_APK \
-DLUA_COMPAT_ALL \ -DLUA_COMPAT_ALL \
-frtti -frtti

4
Sources/libewol/Linux.mk
View File

@ -24,7 +24,7 @@ LOCAL_CFLAGS := -D__PLATFORM__Linux \
-DETK_DEBUG_LEVEL=3 \ -DETK_DEBUG_LEVEL=3 \
-DEWOL_DEBUG_LEVEL=3 \ -DEWOL_DEBUG_LEVEL=3 \
-DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-debug\"" \ -DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-debug\"" \
-DVERSION_BUILD_TIME="\"pasd_heure\"" \ -DBUILD_TIME="\"$(BUILD_TIME)\"" \
-DEWOL_USE_FREE_TYPE \ -DEWOL_USE_FREE_TYPE \
-DLUA_COMPAT_ALL \ -DLUA_COMPAT_ALL \
-Wall -Wall
@ -35,7 +35,7 @@ LOCAL_CFLAGS := -D__PLATFORM__Linux \
-DETK_DEBUG_LEVEL=3 \ -DETK_DEBUG_LEVEL=3 \
-DEWOL_DEBUG_LEVEL=3 \ -DEWOL_DEBUG_LEVEL=3 \
-DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-release\"" \ -DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-release\"" \
-DVERSION_BUILD_TIME="\"pasd_heure\"" \ -DBUILD_TIME="\"$(BUILD_TIME)\"" \
-DLUA_COMPAT_ALL \ -DLUA_COMPAT_ALL \
-DEWOL_USE_FREE_TYPE -DEWOL_USE_FREE_TYPE

2
Sources/libewol/ewol/base/MainThread.cpp
View File

@ -96,7 +96,7 @@ static void* BaseAppEntry(void* param)
EWOL_DEBUG("==> Init BThread (START)"); EWOL_DEBUG("==> Init BThread (START)");
EWOL_INFO("v" EWOL_VERSION_TAG_NAME); EWOL_INFO("v" EWOL_VERSION_TAG_NAME);
EWOL_INFO("Build Date: " VERSION_BUILD_TIME); EWOL_INFO("Build Date: " BUILD_TIME);
etk::InitDefaultFolder("ewolApplNoName"); etk::InitDefaultFolder("ewolApplNoName");

4
Sources/libewol/ewol/ewol.cpp
View File

@ -129,4 +129,8 @@ bool ewol::IsSetInsert(void)
} }
etk::UString ewol::GetVersion(void)
{
return EWOL_VERSION_TAG_NAME;
}

2
Sources/libewol/ewol/ewol.h
View File

@ -76,6 +76,8 @@ namespace ewol {
void SetTitle(etk::UString title); void SetTitle(etk::UString title);
void RequestUpdateSize(void); void RequestUpdateSize(void);
etk::UString GetVersion(void);
}; };
// get current time in ms... // get current time in ms...
int64_t GetCurrentTime(void); int64_t GetCurrentTime(void);

38
Sources/libewol/ewol/widgetMeta/Parameter.cpp
View File

@ -109,14 +109,40 @@ ewol::Parameter::Parameter(void) :
m_paramList->SetExpendY(true); m_paramList->SetExpendY(true);
mySizerHori->SubWidgetAdd(m_paramList); mySizerHori->SubWidgetAdd(m_paramList);
} }
mySpacer = new ewol::Spacer();
m_wSlider = new ewol::WSlider(); if (NULL == mySpacer) {
if (NULL == m_wSlider) {
EWOL_ERROR("Can not allocate widget ==> display might be in error"); EWOL_ERROR("Can not allocate widget ==> display might be in error");
} else { } else {
m_wSlider->SetExpendX(true); mySpacer->SetExpendY(true);
m_wSlider->SetExpendY(true); mySpacer->SetSize(5);
mySizerHori->SubWidgetAdd(m_wSlider); mySpacer->SetColor(0x000000BF);
mySizerHori->SubWidgetAdd(mySpacer);
}
ewol::SizerVert * mySizerVert2 = new ewol::SizerVert();
if (NULL == mySizerVert2) {
EWOL_ERROR("Can not allocate widget ==> display might be in error");
} else {
mySizerHori->SubWidgetAdd(mySizerVert2);
mySpacer = new ewol::Spacer();
if (NULL == mySpacer) {
EWOL_ERROR("Can not allocate widget ==> display might be in error");
} else {
mySpacer->SetExpendX(true);
mySpacer->SetSize(5);
mySpacer->SetColor(0x000000BF);
mySizerVert2->SubWidgetAdd(mySpacer);
}
m_wSlider = new ewol::WSlider();
if (NULL == m_wSlider) {
EWOL_ERROR("Can not allocate widget ==> display might be in error");
} else {
m_wSlider->SetExpendX(true);
m_wSlider->SetExpendY(true);
mySizerVert2->SubWidgetAdd(m_wSlider);
}
} }
} }