From 85a27112d49dc75dc928585e23b388d0da820335 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Mon, 14 Sep 2015 21:11:04 +0200 Subject: [PATCH] [DEV] update Build interface --- egami/ImageMono.cpp | 3 ++- egami/ImagePrivate.h | 2 +- lutin_egami.py | 8 +++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/egami/ImageMono.cpp b/egami/ImageMono.cpp index 4343949..73b91a5 100644 --- a/egami/ImageMono.cpp +++ b/egami/ImageMono.cpp @@ -7,6 +7,7 @@ */ #include +#include egami::ImageMono::ImageMono(const ivec2& _size) : m_size(_size) { @@ -15,7 +16,7 @@ egami::ImageMono::ImageMono(const ivec2& _size) : // preallocate data with a basic bg elements : m_data.resize(m_size.x()*m_size.y(), tmpBg); if ((uint32_t)m_size.x()*m_size.y() > m_data.size()) { - TK_ERROR("Allocation of data buffer in error"); + EGAMI_ERROR("Allocation of data buffer in error"); return; } } diff --git a/egami/ImagePrivate.h b/egami/ImagePrivate.h index b9d445f..cf7abbc 100644 --- a/egami/ImagePrivate.h +++ b/egami/ImagePrivate.h @@ -55,7 +55,7 @@ namespace egami { // preallocate data with a basic bg elements : m_data.resize(m_size.x()*m_size.y(), tmpBg); if ((uint32_t)m_size.x()*m_size.y() > m_data.size()) { - TK_ERROR("Allocation of data buffer in error"); + //TK_ERROR("Allocation of data buffer in error"); return; } } diff --git a/lutin_egami.py b/lutin_egami.py index 28f84a7..9a73ad5 100644 --- a/lutin_egami.py +++ b/lutin_egami.py @@ -22,6 +22,12 @@ def create(target): 'egami/wrapperBMP.cpp', 'egami/wrapperEDF.cpp']) + myModule.add_header_file([ + 'egami/Image.h', + 'egami/ImageMono.h', + 'egami/egami.h', + ]) + # name of the dependency myModule.add_module_depend(['etk', 'png', 'esvg', 'edtaa3']) @@ -29,7 +35,7 @@ def create(target): '-Wno-write-strings', '-Wall']) - myModule.add_export_path(tools.get_current_path(__file__)) + myModule.add_path(tools.get_current_path(__file__)) # add the currrent module at the return myModule