[DEV] update lutin naming

This commit is contained in:
Edouard DUPIN 2013-12-23 22:38:46 +01:00
parent 25b0914786
commit 9cc41e0dad
20 changed files with 155 additions and 130 deletions

2
build

@ -1 +1 @@
Subproject commit 43927acfe1da0a75b5b56de4e128d8dc9cd5e90f
Subproject commit 5079829d049c9233370ffef084cb73c26459ced7

2
external/agg vendored

@ -1 +1 @@
Subproject commit 5f26683625412f2ec0aad32adf6a85abb8312684
Subproject commit e8d0ddca2bc3940816ba2fe87ed65934a506ccd0

View File

@ -2,27 +2,31 @@
# --------------------------------------------------------
# -- Bullet librairy
# --------------------------------------------------------
import lutinModule
import lutinTools
import lutinModule as module
import lutinTools as tools
def Create(target):
myModule = lutinModule.module(__file__, 'bullet', 'LIBRARY')
def get_desc():
return "Bullet lib : C++ physic engine"
def create(target):
myModule = module.Module(__file__, 'bullet', 'LIBRARY')
myModule.AddModuleDepend(['linearmath'])
myModule.add_module_depend(['linearmath'])
#remove compilation warning (specific for external libs):
myModule.remove_compile_warning()
myModule.CompileFlags_CC([
myModule.compile_flags_CC([
'-Wno-write-strings',
'-DHAVE_CONFIG_H',
'-O2'])
myModule.AddExportPath(lutinTools.GetCurrentPath(__file__)+"/bullet/src/")
myModule.AddExportPath(lutinTools.GetCurrentPath(__file__))
myModule.AddPath(lutinTools.GetCurrentPath(__file__)+"/bullet/Extras/ConvexDecomposition")
myModule.add_export_path(tools.get_current_path(__file__)+"/bullet/src/")
myModule.add_export_path(tools.get_current_path(__file__))
myModule.add_path(tools.get_current_path(__file__)+"/bullet/Extras/ConvexDecomposition")
# lib BulletCollision
myModule.AddSrcFile([
myModule.add_src_file([
'bullet/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp',
'bullet/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp',
'bullet/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp',
@ -119,7 +123,7 @@ def Create(target):
# lib BulletDynamics
myModule.AddSrcFile([
myModule.add_src_file([
'bullet/src/BulletDynamics/Dynamics/btRigidBody.cpp',
'bullet/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp',
'bullet/src/BulletDynamics/Dynamics/Bullet-C-API.cpp',
@ -143,7 +147,7 @@ def Create(target):
# lib BulletSoftBody
myModule.AddSrcFile([
myModule.add_src_file([
'bullet/src/BulletSoftBody/btDefaultSoftBodySolver.cpp',
'bullet/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp',
'bullet/src/BulletSoftBody/btSoftBody.cpp',
@ -154,17 +158,17 @@ def Create(target):
'bullet/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp'])
# lib gimpactutils
myModule.AddSrcFile([
myModule.add_src_file([
'bullet/Extras/GIMPACTUtils/btGImpactConvexDecompositionShape.cpp'])
"""
# lib convexdecomposition
myModule.AddSrcFile([
myModule.add_src_file([
'bullet/Extras/ConvexDecomposition/concavity.cpp',
'bullet/Extras/ConvexDecomposition/ConvexDecomposition.cpp',
'bullet/Extras/ConvexDecomposition/vlookup.cpp',
'bullet/Extras/ConvexDecomposition/bestfit.cpp',
'bullet/Extras/ConvexDecomposition/ConvexBuilder.cpp',
'bullet/Extras/ConvexDecomposition/Convexbuilder.cpp',
'bullet/Extras/ConvexDecomposition/cd_hull.cpp',
'bullet/Extras/ConvexDecomposition/raytri.cpp',
'bullet/Extras/ConvexDecomposition/splitplane.cpp',
@ -178,7 +182,7 @@ def Create(target):
"""
# lib HACD
myModule.AddSrcFile([
myModule.add_src_file([
'bullet/Extras/HACD/hacdGraph.cpp',
'bullet/Extras/HACD/hacdHACD.cpp',
'bullet/Extras/HACD/hacdICHull.cpp',

View File

@ -2,15 +2,19 @@
# --------------------------------------------------------
# -- Linear Math librairy
# --------------------------------------------------------
import lutinModule
import lutinTools
import lutinModule as module
import lutinTools as tools
def Create(target):
myModule = lutinModule.module(__file__, 'linearmath', 'LIBRARY')
def get_desc():
return "Bullet lib linar Mathematic interface"
def create(target):
myModule = module.Module(__file__, 'linearmath', 'LIBRARY')
#remove compilation warning (specific for external libs):
myModule.remove_compile_warning()
myModule.AddSrcFile([
myModule.add_src_file([
'bullet/src/LinearMath/btQuickprof.cpp',
'bullet/src/LinearMath/btGeometryUtil.cpp',
'bullet/src/LinearMath/btAlignedAllocator.cpp',
@ -20,12 +24,12 @@ def Create(target):
'bullet/src/LinearMath/btVector3.cpp',
'bullet/src/LinearMath/btConvexHullComputer.cpp'])
myModule.CompileFlags_CC([
myModule.compile_flags_CC([
'-Wno-write-strings',
'-DHAVE_CONFIG_H',
'-O2'])
myModule.AddExportPath(lutinTools.GetCurrentPath(__file__)+"/bullet/src/")
myModule.add_export_path(tools.get_current_path(__file__)+"/bullet/src/")
# add the currrent module at the
return myModule

View File

@ -1,20 +1,24 @@
#!/usr/bin/python
import lutinModule
import lutinTools
import lutinModule as module
import lutinTools as tools
import datetime
def Create(target):
def get_desc():
return "Date buid date of the program"
def create(target):
# module name is 'edn' and type binary.
myModule = lutinModule.module(__file__, 'date', 'LIBRARY')
myModule = module.Module(__file__, 'date', 'LIBRARY')
# add the file to compile:
myModule.AddSrcFile([
myModule.add_src_file([
'date/date.cpp'])
now = datetime.datetime.now()
myModule.CompileFlags_CC([
myModule.compile_flags_CC([
'-Wno-write-strings',
'-Wall',
"-DBUILD_DAY=\""+str(now.day)+"\"",
@ -24,7 +28,7 @@ def Create(target):
"-DBUILD_MINUTE=\""+str(now.minute)+"\"",
"-DBUILD_SECOND=\""+str(now.second)+"\""])
myModule.AddExportPath(lutinTools.GetCurrentPath(__file__))
myModule.add_export_path(tools.get_current_path(__file__))
# add the currrent module at the
return myModule

2
external/egami vendored

@ -1 +1 @@
Subproject commit a0fbfb9c00dafbec5ae445935dd04fde0bdcea46
Subproject commit 9d23505904cbb0ca4447ab53d42c0d0322358384

2
external/ege vendored

@ -1 +1 @@
Subproject commit 015e748d5f624cc0de6c61b87e9b17ede7478a9a
Subproject commit 65bc92f98e8d96a8b1f5a96032ced7e812d41904

2
external/ejson vendored

@ -1 +1 @@
Subproject commit a94d26ba5f824bac1905b50701255e5b8da44275
Subproject commit bf82bb3bbd41b7634e19cfe4a27c0b7d53d8f278

2
external/esvg vendored

@ -1 +1 @@
Subproject commit ac506182726f44783d8035d74b21895dcd048c53
Subproject commit 40494649a6c7e035679d005b57412368715b5ec7

2
external/etk vendored

@ -1 +1 @@
Subproject commit c1ab11e532cae919470637ac4355f0fb099741e4
Subproject commit 6f8a4f85102af6f23f51907f65c30ce47cd022ff

2
external/exml vendored

@ -1 +1 @@
Subproject commit 5f2ae21798cd2967e649dc3520ea667408ad48c6
Subproject commit b12dde7668267b4f91fa5daa063d83b49c7e4da2

2
external/freetype vendored

@ -1 +1 @@
Subproject commit 9532cd9800336c9259aa0f746f146446343a5703
Subproject commit 643eeae79f7238751832ef8434c0278745c4f673

View File

@ -1,15 +1,19 @@
#!/usr/bin/python
import lutinModule
import lutinTools
import lutinModule as module
import lutinTools as tools
def Create(target):
def get_desc():
return "Glew generic glew interface (for windows only)"
def create(target):
if target.name=="Windows":
#http://glew.sourceforge.net/index.html
myModule = lutinModule.module(__file__, 'glew', 'PREBUILD')
myModule = module.Module(__file__, 'glew', 'PREBUILD')
myModule.AddExportPath(lutinTools.GetCurrentPath(__file__) + "/glew/include/")
myModule.AddExportflag_LD([
lutinTools.GetCurrentPath(__file__) + "/glew/lib/glew32s.lib",
myModule.add_export_path(tools.get_current_path(__file__) + "/glew/include/")
myModule.add_export_flag_LD([
tools.get_current_path(__file__) + "/glew/lib/glew32s.lib",
"-lopengl32",
"-lgdi32",
"-static-libgcc",

2
external/lua vendored

@ -1 +1 @@
Subproject commit 7feb84850902ed0e3352d5f486803abf16de503d
Subproject commit 9144ef537e61fe0e1d5ff81243e899fad42ce1c1

2
external/png vendored

@ -1 +1 @@
Subproject commit 9e3234a26908a87680f51bbea83342ed2e579451
Subproject commit 2b5aabe60cad2b53a2a4f8808f50860e918c638b

View File

@ -1,20 +1,24 @@
#!/usr/bin/python
import lutinModule
import lutinTools
import lutinModule as module
import lutinTools as tools
def Create(target):
myModule = lutinModule.module(__file__, 'minizip', 'LIBRARY')
myModule.AddSrcFile([
def get_desc():
return "MINIZIP : Small zip interface"
def create(target):
myModule = module.Module(__file__, 'minizip', 'LIBRARY')
myModule.add_src_file([
"zlib/contrib/minizip/unzip.c",
"zlib/contrib/minizip/zip.c",
"zlib/contrib/minizip/miniunz.c",
"zlib/contrib/minizip/ioapi.c"])
myModule.AddExportPath(lutinTools.GetCurrentPath(__file__) + "/zlib/contrib/")
myModule.add_export_path(tools.get_current_path(__file__) + "/zlib/contrib/")
myModule.AddModuleDepend('z')
myModule.add_module_depend('z')
myModule.CompileFlags_CC([
myModule.compile_flags_CC([
"-DNOCRYPT",
"-DIOAPI_NO_64"])
# add the currrent module at the

24
external/z/lutin_z.py vendored
View File

@ -1,11 +1,15 @@
#!/usr/bin/python
import lutinModule
import lutinTools
import lutinModule as module
import lutinTools as tools
def Create(target):
def get_desc():
return "z-lib library (for windows)"
def create(target):
if target.name=="Windows":
myModule = lutinModule.module(__file__, 'z', 'LIBRARY')
myModule.AddSrcFile([
myModule = module.Module(__file__, 'z', 'LIBRARY')
myModule.add_src_file([
"zlib/adler32.c",
"zlib/crc32.c",
"zlib/deflate.c",
@ -22,19 +26,19 @@ def Create(target):
"zlib/gzread.c",
"zlib/gzwrite.c"])
myModule.AddExportPath(lutinTools.GetCurrentPath(__file__))
myModule.AddExportPath(lutinTools.GetCurrentPath(__file__) + "/zlib")
myModule.add_export_path(tools.get_current_path(__file__))
myModule.add_export_path(tools.get_current_path(__file__) + "/zlib")
myModule.CompileFlags_CC([
myModule.compile_flags_CC([
"-D_LARGEFILE64_SOURCE=1",
"-DHAVE_HIDDEN"])
# add the currrent module at the
return myModule
else:
myModule = lutinModule.module(__file__, 'z', 'PREBUILD')
myModule = module.Module(__file__, 'z', 'PREBUILD')
myModule.AddExportflag_LD('-lz')
myModule.add_export_flag_LD('-lz')
# add the currrent module at the
return myModule

2
monk

@ -1 +1 @@
Subproject commit b6c956edef5f1c8615780d1e183a81dae2427eac
Subproject commit 1a112e40005744781cb711f4c795ef9cdab96b08

View File

@ -1,27 +1,32 @@
#!/usr/bin/python
import lutinModule
import lutinTools
import lutinModule as module
import lutinTools as tools
import os
import lutinMultiprocess
def Create(target):
def get_desc():
return "ewol is a main library to use widget in the openGl environement and manage all the wraping os"
def create(target):
# set the ewol folder for Android basic sources ...
target.SetEwolFolder(lutinTools.GetCurrentPath(__file__) + "/../")
target.set_ewol_folder(tools.get_current_path(__file__) + "/../")
# module name is 'edn' and type binary.
myModule = lutinModule.module(__file__, 'ewol', 'LIBRARY')
myModule = module.Module(__file__, 'ewol', 'LIBRARY')
# add extra compilation flags :
#myModule.add_extra_compile_flags()
# add the file to compile:
myModule.AddSrcFile([
myModule.add_src_file([
'ewol/ewol.cpp',
'ewol/debug.cpp',
'ewol/Dimension.cpp'
])
# compositing :
myModule.AddSrcFile([
myModule.add_src_file([
'ewol/compositing/Compositing.cpp',
'ewol/compositing/Text.cpp',
'ewol/compositing/Drawing.cpp',
@ -32,7 +37,7 @@ def Create(target):
])
# context :
myModule.AddSrcFile([
myModule.add_src_file([
'ewol/context/clipBoard.cpp',
'ewol/context/commandLine.cpp',
'ewol/context/ConfigFont.cpp',
@ -41,13 +46,13 @@ def Create(target):
'ewol/context/InputManager.cpp'
])
if target.name=="Linux":
myModule.AddSrcFile('ewol/context/X11/Context.cpp')
myModule.add_src_file('ewol/context/X11/Context.cpp')
elif target.name=="Android":
myModule.AddSrcFile("ewol/context/Android/Context.cpp")
myModule.add_src_file("ewol/context/Android/Context.cpp")
elif target.name=="Windows":
myModule.AddSrcFile("ewol/context/Windows/Context.cpp")
myModule.add_src_file("ewol/context/Windows/Context.cpp")
elif target.name=="MacOs":
myModule.AddSrcFile([
myModule.add_src_file([
"ewol/context/MacOs/Context.cpp",
"ewol/context/MacOs/Interface.mm",
"ewol/context/MacOs/AppDelegate.mm",
@ -56,14 +61,14 @@ def Create(target):
debug.error("unknow mode...")
# event properties :
myModule.AddSrcFile([
myModule.add_src_file([
'ewol/event/Entry.cpp',
'ewol/event/Time.cpp',
'ewol/event/Input.cpp'
])
# Key properties :
myModule.AddSrcFile([
myModule.add_src_file([
'ewol/key/keyboard.cpp',
'ewol/key/Special.cpp',
'ewol/key/status.cpp',
@ -71,7 +76,7 @@ def Create(target):
])
# object :
myModule.AddSrcFile([
myModule.add_src_file([
'ewol/object/Config.cpp',
'ewol/object/ConfigElement.cpp',
'ewol/object/Manager.cpp',
@ -81,12 +86,12 @@ def Create(target):
])
# OpenGL interface :
myModule.AddSrcFile([
myModule.add_src_file([
'ewol/openGL/openGL.cpp'
])
# resources :
myModule.AddSrcFile([
myModule.add_src_file([
'ewol/resource/Colored3DObject.cpp',
'ewol/resource/ConfigFile.cpp',
'ewol/resource/FontFreeType.cpp',
@ -101,7 +106,7 @@ def Create(target):
])
# widget :
myModule.AddSrcFile([
myModule.add_src_file([
'ewol/widget/ButtonColor.cpp',
'ewol/widget/Button.cpp',
'ewol/widget/CheckBox.cpp',
@ -137,70 +142,70 @@ def Create(target):
'ewol/widget/WSlider.cpp',
])
myModule.CopyFolder('../data/theme/default/widgetEntry.*','theme/default')
myModule.CopyFolder('../data/theme/rounded/widgetEntry.*','theme/rounded')
myModule.CopyFolder('../data/theme/default/widgetButton.*','theme/default')
myModule.CopyFolder('../data/theme/rounded/widgetButton.*','theme/rounded')
myModule.CopyFolder('../data/theme/default/widgetContextMenu.*','theme/default')
myModule.CopyFolder('../data/theme/rounded/widgetContextMenu.*','theme/rounded')
myModule.CopyFolder('../data/theme/default/widgetPopUp.*','theme/default')
myModule.CopyFolder('../data/theme/rounded/widgetPopUp.*','theme/rounded')
myModule.CopyFolder('../data/textured.*','')
myModule.CopyFolder('../data/texturedNoMaterial.*','')
myModule.CopyFolder('../data/text.*','')
myModule.CopyFolder('../data/simple3D.*','')
myModule.CopyFolder('../data/color.*','')
myModule.CopyFolder('../data/color3.*','')
myModule.CopyFolder('../data/textured3D2.*','')
myModule.CopyFolder('../data/textured3D.*','')
myModule.copy_folder('../data/theme/default/widgetEntry.*','theme/default')
myModule.copy_folder('../data/theme/rounded/widgetEntry.*','theme/rounded')
myModule.copy_folder('../data/theme/default/widgetButton.*','theme/default')
myModule.copy_folder('../data/theme/rounded/widgetButton.*','theme/rounded')
myModule.copy_folder('../data/theme/default/widgetContextMenu.*','theme/default')
myModule.copy_folder('../data/theme/rounded/widgetContextMenu.*','theme/rounded')
myModule.copy_folder('../data/theme/default/widgetPopUp.*','theme/default')
myModule.copy_folder('../data/theme/rounded/widgetPopUp.*','theme/rounded')
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.*','')
# name of the dependency
myModule.AddModuleDepend(['etk', 'freetype', 'exml', 'ejson', 'egami', 'date'])
myModule.add_module_depend(['etk', 'freetype', 'exml', 'ejson', 'egami', 'date'])
myModule.AddExportPath(lutinTools.GetCurrentPath(__file__))
myModule.add_export_path(tools.get_current_path(__file__))
tagFile = lutinTools.GetCurrentPath(__file__) + "/tag"
ewolVersionID = lutinTools.FileReadData(tagFile)
myModule.CompileFlags_CC([
tagFile = tools.get_current_path(__file__) + "/tag"
ewolVersionID = tools.file_read_data(tagFile)
myModule.compile_flags_CC([
"-DEWOL_VERSION=\"\\\""+ewolVersionID+"\\\"\""
])
if target.name=="Linux":
myModule.AddExportflag_LD('-lGL')
myModule.add_export_flag_LD('-lGL')
#`pkg-config --cflags directfb` `pkg-config --libs directfb`
#ifeq ("$(CONFIG___EWOL_LINUX_GUI_MODE_X11__)","y")
myModule.AddExportflag_LD('-lX11')
myModule.add_export_flag_LD('-lX11')
#endif
#ifeq ("$(CONFIG___EWOL_LINUX_GUI_MODE_DIRECT_FB__)","y")
#myModule.AddExportflag_LD(['-L/usr/local/lib', '-ldirectfb', '-lfusion', '-ldirect'])
#myModule.add_export_flag_LD(['-L/usr/local/lib', '-ldirectfb', '-lfusion', '-ldirect'])
#endif
#http://en.wikibooks.org/wiki/OpenGL_Programming/Modern_OpenGL_Introduction
# needed package on linux : libgl1-mesa-dev libglew1.5-dev
#ifeq ("$(CONFIG_BUILD_PORTAUDIO)","y")
#myModule.AddSrcFile('ewol/renderer/audio/interfacePortAudio.cpp')
#myModule.add_src_file('ewol/renderer/audio/interfacePortAudio.cpp')
#endif
elif target.name=="Android":
myModule.AddExportflag_LD("-lGLESv2")
myModule.add_export_flag_LD("-lGLESv2")
myModule.AddExportflag_LD("-ldl")
myModule.AddExportflag_LD("-llog")
myModule.AddExportflag_LD("-landroid")
java_tmp_dir = lutinTools.GetCurrentPath(__file__) + "/../../ewol/sources/android/src/"
cpp_tmp_dir = lutinTools.GetCurrentPath(__file__) + "/ewol/renderer/Android/"
myModule.add_export_flag_LD("-ldl")
myModule.add_export_flag_LD("-llog")
myModule.add_export_flag_LD("-landroid")
java_tmp_dir = tools.get_current_path(__file__) + "/../../ewol/sources/android/src/"
cpp_tmp_dir = tools.get_current_path(__file__) + "/ewol/renderer/Android/"
java_tmp_src = java_tmp_dir + "org/ewol/EwolConstants"
lutinMultiprocess.RunCommand("javac " + java_tmp_src + ".java")
lutinMultiprocess.RunCommand("cd " + java_tmp_dir + " && javah org.ewol.EwolConstants")
lutinTools.CopyFile(java_tmp_dir + "org_ewol_EwolConstants.h", cpp_tmp_dir + "org_ewol_EwolConstants.h", True)
lutinTools.RemoveFile(java_tmp_src + ".class")
lutinMultiprocess.run_command("javac " + java_tmp_src + ".java")
lutinMultiprocess.run_command("cd " + java_tmp_dir + " && javah org.ewol.EwolConstants")
tools.copy_file(java_tmp_dir + "org_ewol_EwolConstants.h", cpp_tmp_dir + "org_ewol_EwolConstants.h", True)
tools.remove_file(java_tmp_src + ".class")
elif target.name=="Windows":
myModule.AddModuleDepend("glew")
myModule.add_module_depend("glew")
elif target.name=="MacOs":
myModule.AddExportflag_LD([
myModule.add_export_flag_LD([
"-framework Cocoa",
"-framework OpenGL",
"-framework QuartzCore",
@ -209,7 +214,3 @@ def Create(target):
# add the currrent module at the
return myModule
def GetDesc():
return "ewol is a main library to use widget in the openGl environement and manage all the wraping os"

View File

@ -2,8 +2,11 @@
import monkModule
import monkTools as tools
def get_desc():
return "EWOL main library (Edn Widget on OpenGl Layer)"
def create():
# module name is 'edn' and type binary.
# module name is 'ewol' and type binary.
myModule = monkModule.Module(__file__, 'ewol', 'LIBRARY')
# enable doculentation :
myModule.set_website("http://heeroyui.github.io/ewol/")
@ -12,6 +15,3 @@ def create():
# add the currrent module at the
return myModule
def get_desc():
return "EWOL main node"