diff --git a/lutin_zxing-cli.py b/lutin_zxing-cli.py
index 0ff0e2a..bec694c 100644
--- a/lutin_zxing-cli.py
+++ b/lutin_zxing-cli.py
@@ -38,7 +38,7 @@ def create(target, module_name):
 	# build in C mode
 	my_module.compile_version("c++", 2003)
 	my_module.add_path(os.path.join(tools.get_current_path(__file__), "zxing-cpp", "cli", "src"))
-	my_module.add_module_depend('zxing')
+	my_module.add_depend('zxing')
 	return my_module
 
 
diff --git a/lutin_zxing-test.py b/lutin_zxing-test.py
index 2dbbb6d..b553ac4 100644
--- a/lutin_zxing-test.py
+++ b/lutin_zxing-test.py
@@ -46,7 +46,7 @@ def create(target, module_name):
 	# build in C mode
 	my_module.compile_version("c++", 2003)
 	my_module.add_path(os.path.join(tools.get_current_path(__file__), "zxing-cpp", "core", "test", "src"))
-	my_module.add_module_depend(['zxing', 'cppunit'])
+	my_module.add_depend(['zxing', 'cppunit'])
 	return my_module
 
 
diff --git a/lutin_zxing.py b/lutin_zxing.py
index 940f820..821c0ff 100644
--- a/lutin_zxing.py
+++ b/lutin_zxing.py
@@ -131,19 +131,20 @@ def create(target, module_name):
 		])
 	# build in C mode
 	my_module.compile_version("c++", 2003)
-	my_module.add_module_depend([
+	my_module.add_depend([
 	    'cxx',
 	    'm',
 	    'pthread'
 	    ])
 	#my_module.add_path(os.path.join(tools.get_current_path(__file__), "zxing-cpp", "core", "src"))
-	my_module.compile_flags('c++', [
+	my_module.add_flag('c++', [
 		"-D_CRT_SECURE_NO_WARNINGS"
 		])
-	#my_module.add_optionnal_module_depend('iconv', [], ["c", "-DNO_ICONV=1"])
-	my_module.add_export_flag('c++', [
+	#my_module.add_optionnal_depend('iconv', [], ["c", "-DNO_ICONV=1"])
+	my_module.add_flag('c++', [
 		"-DNO_ICONV=1"
-		])
+		],
+		export=True)
 
 	my_module.add_header_file([
 		"zxing-cpp/core/src/bigint/BigUnsignedInABase.hh",
@@ -299,7 +300,7 @@ def create(target, module_name):
 		"zxing-cpp/core/src/zxing/FormatException.h"
 		], destination_path="zxing")
 	
-	if target.name=="Windows":
+	if "Windows" in target.get_type():
 		my_module.add_src_file([
 			"zxing-cpp/core/src/win32/zxing/win_iconv.c"
 			])