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

[DEV] update next lutin version

Browse Source
This commit is contained in:
Edouard DUPIN 2015-09-24 21:44:04 +02:00
parent 705ac5183e
commit ce986790d0
6 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etk/log.cpp
View File

@ -68,7 +68,7 @@
#endif #endif
#ifdef DEBUG #ifdef DEBUG
#define DEFAULT_LOG_LEVEL etk::log::logLevelInfo #define DEFAULT_LOG_LEVEL etk::log::logLevelDebug
#define DEFAULT_LOG_COLOR true #define DEFAULT_LOG_COLOR true
#define DEFAULT_LOG_LINE true #define DEFAULT_LOG_LINE true
#define DEFAULT_LOG_THREAD_ID true #define DEFAULT_LOG_THREAD_ID true

2
etk/log.h
View File

@ -121,7 +121,7 @@ namespace etk {
#ifdef __class__ #ifdef __class__
#undef __class__ #undef __class__
#endif #endif
#define __class__ (NULL) #define __class__ (nullptr)
// generic define for all logs:: // generic define for all logs::
#define TK_LOG_BASE(logId,info,data) \ #define TK_LOG_BASE(logId,info,data) \

5
etk/os/FSNode.cpp
View File

@ -839,7 +839,7 @@ void etk::FSNode::generateFileSystemPath() {
// check in the application folder. // check in the application folder.
TK_DBG_MODE("DATA Search in application data:"); TK_DBG_MODE("DATA Search in application data:");
m_systemFileName = simplifyPath(baseFolderData + "/" + m_userFileName); m_systemFileName = simplifyPath(baseFolderData + "/" + m_userFileName);
if (directCheckFile(m_systemFileName) == true) { if (directCheckFile(m_systemFileName, true) == true) {
return; return;
} }
if (m_libSearch.size() == 0) { if (m_libSearch.size() == 0) {
@ -1321,6 +1321,9 @@ bool etk::FSNode::operator!= (const etk::FSNode& _obj ) const {
} }
std::ostream& etk::operator <<(std::ostream &_os, const etk::FSNode &_obj) { std::ostream& etk::operator <<(std::ostream &_os, const etk::FSNode &_obj) {
if (_obj.m_libSearch.size() != 0) {
_os << "{" << _obj.m_libSearch << "}";
}
_os << "[" << _obj.m_type << "]->\"" << _obj.m_userFileName << "\""; _os << "[" << _obj.m_type << "]->\"" << _obj.m_userFileName << "\"";
return _os; return _os;
} }

10
lutin_etk-test.py
View File

@ -9,16 +9,16 @@ def get_desc():
def create(target): def create(target):
# module name is 'edn' and type binary. # module name is 'edn' and type binary.
myModule = module.Module(__file__, 'etk-test', 'BINARY') my_module = module.Module(__file__, 'etk-test', 'BINARY')
# add the file to compile: # add the file to compile:
myModule.add_src_file([ my_module.add_src_file([
'test/main.cpp']) 'test/main.cpp'])
myModule.add_module_depend(['etk', 'gtest']) my_module.add_module_depend(['etk', 'gtest'])
#myModule.compile_flags_XX(["-nostdinc++"]); #my_module.compile_flags_XX(["-nostdinc++"]);
# add the currrent module at the system # add the currrent module at the system
return myModule return my_module

30
lutin_etk.py
View File

@ -8,11 +8,11 @@ def get_desc():
def create(target): def create(target):
# module name is 'edn' and type binary. # module name is 'edn' and type binary.
myModule = module.Module(__file__, 'etk', 'LIBRARY') my_module = module.Module(__file__, 'etk', 'LIBRARY')
# add extra compilation flags : # add extra compilation flags :
myModule.add_extra_compile_flags() my_module.add_extra_compile_flags()
# add the file to compile: # add the file to compile:
myModule.add_src_file([ my_module.add_src_file([
'etk/debug.cpp', 'etk/debug.cpp',
'etk/etk.cpp', 'etk/etk.cpp',
'etk/stdTools.cpp', 'etk/stdTools.cpp',
@ -31,9 +31,9 @@ def create(target):
'etk/archive/Zip.cpp']) 'etk/archive/Zip.cpp'])
if target.name=="IOs": if target.name=="IOs":
myModule.add_src_file('etk/logIOs.m') my_module.add_src_file('etk/logIOs.m')
myModule.add_header_file([ my_module.add_header_file([
'etk/etk.h', 'etk/etk.h',
'etk/types.h', 'etk/types.h',
'etk/stdTools.h', 'etk/stdTools.h',
@ -56,29 +56,29 @@ def create(target):
if target.config["mode"] == "release": if target.config["mode"] == "release":
# TODO : The other way is to remove this ... # TODO : The other way is to remove this ...
# TODO : Fore release mode : the etk folder are absolutly not at the same position in the tree ... # TODO : Fore release mode : the etk folder are absolutly not at the same position in the tree ...
myModule.compile_flags('c', "-DMODE_RELEASE") my_module.compile_flags('c', "-DMODE_RELEASE")
else: else:
myModule.add_export_flag('c', "-DDEBUG_LEVEL=3") my_module.add_export_flag('c', "-DDEBUG_LEVEL=3")
myModule.add_export_flag('c', "-DDEBUG=1") my_module.add_export_flag('c', "-DDEBUG=1")
# Bor backtrace display : # Bor backtrace display :
if target.name != "Windows": if target.name != "Windows":
myModule.add_export_flag('link', "-ldl -rdynamic") my_module.add_export_flag('link', "-ldl -rdynamic")
myModule.compile_version_XX(2011) my_module.compile_version_XX(2011)
# name of the dependency # name of the dependency
myModule.add_optionnal_module_depend('minizip', ["c++", "-DETK_BUILD_MINIZIP"]) my_module.add_optionnal_module_depend('minizip', ["c++", "-DETK_BUILD_MINIZIP"])
myModule.add_optionnal_module_depend('linearmath', ["c", "-DETK_BUILD_LINEARMATH"], export=True) my_module.add_optionnal_module_depend('linearmath', ["c", "-DETK_BUILD_LINEARMATH"], export=True)
if target.name=="Windows": if target.name=="Windows":
pass pass
elif target.name=="Android": elif target.name=="Android":
pass pass
else: else:
myModule.add_export_flag('link', "-lpthread") my_module.add_export_flag('link', "-lpthread")
myModule.add_path(tools.get_current_path(__file__)) my_module.add_path(tools.get_current_path(__file__))
# add the currrent module at the # add the currrent module at the
return myModule return my_module

10
tools/lutin_test-debug.py
View File

@ -8,12 +8,12 @@ def get_desc():
def create(target): def create(target):
myModule = module.Module(__file__, 'test-debug', 'LIBRARY') my_module = module.Module(__file__, 'test-debug', 'LIBRARY')
myModule.add_src_file([ my_module.add_src_file([
'test-debug/debug.cpp' 'test-debug/debug.cpp'
]) ])
myModule.add_module_depend('etk') my_module.add_module_depend('etk')
myModule.add_export_path(tools.get_current_path(__file__)) my_module.add_export_path(tools.get_current_path(__file__))
return myModule return my_module