diff --git a/config/Linux.config b/config/Linux.config index 409e13e..7e5169f 100644 --- a/config/Linux.config +++ b/config/Linux.config @@ -1,6 +1,6 @@ # -# Automatically generated make config: don't edit -# Linux kernel version: +# Automatically generated file; DO NOT EDIT. +# Linux Kernel Configuration # # @@ -8,8 +8,9 @@ # CONFIG_BUILD_EDN=y # CONFIG_BUILD_AGG is not set +CONFIG_BUILD_LINEARMATH=y +CONFIG_BUILD_BULLET=y # CONFIG_BUILD_ETK is not set -# CONFIG_BUILD_EWOL is not set # CONFIG_BUILD_FREETYPE is not set # CONFIG_BUILD_LUA is not set # CONFIG_BUILD_OGG is not set @@ -19,6 +20,7 @@ CONFIG_BUILD_EDN=y # CONFIG_BUILD_TINYXML is not set # CONFIG_BUILD_ZLIB is not set # CONFIG_BUILD_LIBZIP is not set +# CONFIG_BUILD_EWOL is not set # # edn @@ -37,5 +39,11 @@ CONFIG_APPL_BUFFER_FONT_NORMAL=y # # General # -# CONFIG___EWOL_INTEGRATED_FONT__ is not set CONFIG___EWOL_APPL_BASIC_TITLE__="Edn : Sources Code Editor" +# CONFIG___EWOL_INTEGRATED_FONT__ is not set + +# +# Linux +# +CONFIG___EWOL_LINUX_GUI_MODE_X11__=y +# CONFIG___EWOL_LINUX_GUI_MODE_DIRECT_FB__ is not set diff --git a/sources/appl/Buffer/BufferText.cpp b/sources/appl/Buffer/BufferText.cpp index 33cc9a0..6e79de7 100644 --- a/sources/appl/Buffer/BufferText.cpp +++ b/sources/appl/Buffer/BufferText.cpp @@ -114,9 +114,7 @@ bool BufferText::NeedToUpdateDisplayPosition(void) vec2 BufferText::GetBorderSize(void) { - vec2 tmpVal; - tmpVal.setValue(30,30); - return tmpVal; + return vec2(30,30);; } @@ -864,7 +862,7 @@ vec2 BufferText::GetPosition(int32_t fontId, bool& centerRequested) { centerRequested = m_centerRequested; m_centerRequested = false; - vec2 outputPosition; + vec2 outputPosition(0,0); // Display position (Y mode): APPL_INFO("change the position : " << m_cursorPos); @@ -892,7 +890,7 @@ vec2 BufferText::GetPosition(int32_t fontId, bool& centerRequested) /* if we request a center : } else { // center the line at the middle of the screen : - vec2 outputPosition; + vec2 outputPosition(0,0); //APPL_DEBUG(" -------------------------------------------------"); outputPosition.y = m_EdnBuf.CountLines(0, m_cursorPos); //APPL_DEBUG(" cursor position : " << m_cursorPos << " ==> ligne=" << outputPosition.y); diff --git a/sources/appl/Gui/CodeView.cpp b/sources/appl/Gui/CodeView.cpp index 56e8b54..56eb626 100644 --- a/sources/appl/Gui/CodeView.cpp +++ b/sources/appl/Gui/CodeView.cpp @@ -84,8 +84,7 @@ CodeView::~CodeView(void) */ void CodeView::UpdateNumberOfLineReference(int32_t bufferID) { - vec2 tmpCoord; - tmpCoord.setValue(0,0); + vec2 tmpCoord(0,0); if (m_lineNumberList.Size()<=bufferID) { // update the number of elements : for (int32_t iii=m_lineNumberList.Size(); iii <= bufferID; iii++) { diff --git a/sources/appl/init.cpp b/sources/appl/init.cpp index 1738fca..37dd048 100644 --- a/sources/appl/init.cpp +++ b/sources/appl/init.cpp @@ -49,22 +49,22 @@ int main(int argc, const char *argv[]) void APP_Init(void) { #ifdef MODE_RELEASE - char * debugMode = "Release"; + const char * debugMode = "Release"; #else - char * debugMode = "Debug"; + const char * debugMode = "Debug"; #endif #ifdef __TARGET_OS__Linux - char * osMode = "Linux"; + const char * osMode = "Linux"; #elif defined(__TARGET_OS__Android) - char * osMode = "Android"; + const char * osMode = "Android"; #elif defined(__TARGET_OS__Windows) - char * osMode = "Windows"; + const char * osMode = "Windows"; #elif defined(__TARGET_OS__IOs) - char * osMode = "IOs"; + const char * osMode = "IOs"; #elif defined(__TARGET_OS__MacOs) - char * osMode = "MacOs"; + const char * osMode = "MacOs"; #else - char * osMode = "Unknown"; + const char * osMode = "Unknown"; #endif APPL_INFO("==> Init "PROJECT_NAME" (START) [" << osMode << "] (" << debugMode << ")");