diff --git a/ewol/context/Context.cpp b/ewol/context/Context.cpp index 630bb8db..4f0a345c 100644 --- a/ewol/context/Context.cpp +++ b/ewol/context/Context.cpp @@ -16,8 +16,6 @@ #include #include -#include - #include #include @@ -96,7 +94,6 @@ void ewol::Context::onCreate(gale::Context& _context) { } EWOL_INFO("EWOL v:" << ewol::getVersion()); - EWOL_INFO("Build Date: " << date::getYear() << "/" << date::getMonth() << "/" << date::getDay() << " " << date::getHour() << "h" << date::getMinute()); // force a recalculation /* requestUpdateSize(); diff --git a/ewol/ewol.cpp b/ewol/ewol.cpp index f93a8c04..a0002d5d 100644 --- a/ewol/ewol.cpp +++ b/ewol/ewol.cpp @@ -14,7 +14,6 @@ #include #include #include -#include #undef __class__ #define __class__ "ewol" diff --git a/lutin_ewol.py b/lutin_ewol.py index da26ab98..c2c00d4c 100644 --- a/lutin_ewol.py +++ b/lutin_ewol.py @@ -12,14 +12,10 @@ def get_license(): return "APACHE v2.0" def create(target): - # set the ewol folder for Android basic sources ... - # TODO: Remove this really bad interface : - target.set_ewol_folder(tools.get_current_path(__file__)) - # module name is 'edn' and type binary. myModule = module.Module(__file__, 'ewol', 'LIBRARY') - # add extra compilation flags : + # add extra compilation flags: myModule.add_extra_compile_flags() # add the file to compile: myModule.add_src_file([ @@ -28,8 +24,13 @@ def create(target): 'ewol/Padding.cpp', 'ewol/translate.cpp' ]) + myModule.add_header_file([ + 'ewol/ewol.h', + 'ewol/Padding.h', + 'ewol/translate.h' + ]) - # compositing : + # compositing: myModule.add_src_file([ 'ewol/compositing/Compositing.cpp', 'ewol/compositing/TextBase.cpp', @@ -41,39 +42,80 @@ def create(target): 'ewol/compositing/Shaper.cpp', 'ewol/compositing/Area.cpp' ]) + myModule.add_header_file([ + 'ewol/compositing/Text.h', + 'ewol/compositing/Drawing.h', + 'ewol/compositing/Sprite.h', + 'ewol/compositing/Area.h', + 'ewol/compositing/Shaper.h', + 'ewol/compositing/TextDF.h', + 'ewol/compositing/TextBase.h', + 'ewol/compositing/Compositing.h', + 'ewol/compositing/Image.h' + ]) - # context : + # context: myModule.add_src_file([ 'ewol/context/ConfigFont.cpp', 'ewol/context/Context.cpp', 'ewol/context/InputManager.cpp' ]) + myModule.add_header_file([ + 'ewol/context/ConfigFont.h', + 'ewol/context/Context.h', + 'ewol/context/Application.h', + 'ewol/context/InputManager.h' + ]) - # event properties : + # event properties: myModule.add_src_file([ 'ewol/event/Entry.cpp', 'ewol/event/Time.cpp', 'ewol/event/Input.cpp' ]) + myModule.add_header_file([ + 'ewol/event/Time.h', + 'ewol/event/Input.h', + 'ewol/event/Entry.h' + ]) - # object : + # object: myModule.add_src_file([ 'ewol/object/Manager.cpp', 'ewol/object/Object.cpp', 'ewol/object/Worker.cpp' ]) - # parameter : + myModule.add_header_file([ + 'ewol/object/Worker.h', + 'ewol/object/Manager.h', + 'ewol/object/Object.h' + ]) + + # parameter: myModule.add_src_file([ 'ewol/parameter/Parameter.cpp', 'ewol/parameter/Interface.cpp', ]) - # Signal : + myModule.add_header_file([ + 'ewol/parameter/Value.h', + 'ewol/parameter/Interface.h', + 'ewol/parameter/Parameter.h', + 'ewol/parameter/Range.h', + 'ewol/parameter/List.h' + ]) + + # Signal: myModule.add_src_file([ 'ewol/signal/Interface.cpp', 'ewol/signal/Base.cpp' ]) + myModule.add_header_file([ + 'ewol/signal/Interface.h', + 'ewol/signal/Base.h', + 'ewol/signal/Signal.h' + ]) - # resources : + # resources: myModule.add_src_file([ 'ewol/resource/Colored3DObject.cpp', 'ewol/resource/ColorFile.cpp', @@ -85,8 +127,22 @@ def create(target): 'ewol/resource/TexturedFont.cpp', 'ewol/resource/DistanceFieldFont.cpp' ]) + myModule.add_header_file([ + 'ewol/resource/FontFreeType.h', + 'ewol/resource/TexturedFont.h', + 'ewol/resource/ColorFile.h', + 'ewol/resource/font/FontBase.h', + 'ewol/resource/font/Kerning.h', + 'ewol/resource/font/GlyphProperty.h', + 'ewol/resource/DistanceFieldFont.h', + 'ewol/resource/ImageDF.h', + 'ewol/resource/Colored3DObject.h', + 'ewol/resource/ConfigFile.h', + 'ewol/resource/Texture.h', + 'ewol/resource/Image.h' + ]) - # widget : + # widget: myModule.add_src_file([ 'ewol/widget/ButtonColor.cpp', 'ewol/widget/Button.cpp', @@ -123,25 +179,62 @@ def create(target): 'ewol/widget/Windows.cpp', 'ewol/widget/WSlider.cpp', ]) + myModule.add_header_file([ + 'ewol/widget/Menu.h', + 'ewol/widget/Slider.h', + 'ewol/widget/WidgetScrolled.h', + 'ewol/widget/ListFileSystem.h', + 'ewol/widget/Panned.h', + 'ewol/widget/WSlider.h', + 'ewol/widget/Container2.h', + 'ewol/widget/Windows.h', + 'ewol/widget/CheckBox.h', + 'ewol/widget/Container.h', + 'ewol/widget/PopUp.h', + 'ewol/widget/Label.h', + 'ewol/widget/Composer.h', + 'ewol/widget/Sizer.h', + 'ewol/widget/Scroll.h', + 'ewol/widget/ContainerN.h', + 'ewol/widget/Spacer.h', + 'ewol/widget/Button.h', + 'ewol/widget/Manager.h', + 'ewol/widget/Entry.h', + 'ewol/widget/ContextMenu.h', + 'ewol/widget/Gird.h', + 'ewol/widget/ProgressBar.h', + 'ewol/widget/ColorBar.h', + 'ewol/widget/ButtonColor.h', + 'ewol/widget/Layer.h', + 'ewol/widget/Joystick.h', + 'ewol/widget/Widget.h', + 'ewol/widget/meta/StdPopUp.h', + 'ewol/widget/meta/ParameterList.h', + 'ewol/widget/meta/ColorChooser.h', + 'ewol/widget/meta/Parameter.h', + 'ewol/widget/meta/FileChooser.h', + 'ewol/widget/Image.h', + 'ewol/widget/List.h' + ]) - myModule.copy_folder('data/theme/shape/square/*','theme/shape/square') - myModule.copy_folder('data/theme/shape/round/*','theme/shape/round') - myModule.copy_folder('data/theme/color/black/*','theme/color/black') - myModule.copy_folder('data/theme/color/white/*','theme/color/white') - myModule.copy_folder('data/textured.*','') - myModule.copy_folder('data/texturedNoMaterial.*','') - myModule.copy_folder('data/text.*','') - myModule.copy_folder('data/simple3D.*','') - myModule.copy_folder('data/color.*','') - myModule.copy_folder('data/color3.*','') - myModule.copy_folder('data/textured3D2.*','') - myModule.copy_folder('data/textured3D.*','') - myModule.copy_folder('data/texturedDF.*','') - myModule.copy_folder('data/fontDistanceField/*','fontDistanceField') - myModule.copy_folder('data/translate/*','translate/ewol/') + myModule.copy_path('data/theme/shape/square/*','theme/shape/square') + myModule.copy_path('data/theme/shape/round/*','theme/shape/round') + myModule.copy_path('data/theme/color/black/*','theme/color/black') + myModule.copy_path('data/theme/color/white/*','theme/color/white') + myModule.copy_path('data/textured.*','') + myModule.copy_path('data/texturedNoMaterial.*','') + myModule.copy_path('data/text.*','') + myModule.copy_path('data/simple3D.*','') + myModule.copy_path('data/color.*','') + myModule.copy_path('data/color3.*','') + myModule.copy_path('data/textured3D2.*','') + myModule.copy_path('data/textured3D.*','') + myModule.copy_path('data/texturedDF.*','') + myModule.copy_path('data/fontDistanceField/*','fontDistanceField') + myModule.copy_path('data/translate/*','translate/ewol/') # name of the dependency - myModule.add_module_depend(['etk', 'gale', 'freetype', 'exml', 'ejson', 'egami', 'edtaa3', 'date']) + myModule.add_module_depend(['etk', 'gale', 'freetype', 'exml', 'ejson', 'egami', 'edtaa3']) myModule.add_export_path(tools.get_current_path(__file__)) diff --git a/sample/examplewallpaper/lutin_examplewallpaper.py b/sample/examplewallpaper/lutin_examplewallpaper.py index c9df90e1..204cae63 100644 --- a/sample/examplewallpaper/lutin_examplewallpaper.py +++ b/sample/examplewallpaper/lutin_examplewallpaper.py @@ -23,7 +23,7 @@ def create(target): myModule.compile_flags('c++', [ "-DPROJECT_NAME=\"\\\""+myModule.name+"\\\"\""]) - myModule.copy_folder('data/SnowFlake.svg','') + myModule.copy_path('data/SnowFlake.svg','') myModule.add_path(tools.get_current_path(__file__))