diff --git a/lib_acl_cpp/xmake.lua b/lib_acl_cpp/xmake.lua
index feabd01c4..346beb1c8 100644
--- a/lib_acl_cpp/xmake.lua
+++ b/lib_acl_cpp/xmake.lua
@@ -12,7 +12,7 @@ target("acl_cpp")
 
     -- add include directories
     add_includedirs("$(projectdir)/include")
-    add_includedirs("$(projectdir)/include/zlib")
+    add_includedirs("$(projectdir)/include/zlib-1.2.11")
     add_includedirs("$(projectdir)/include/mysql")
     add_includedirs("$(projectdir)/include/pgsql")
     add_includedirs("$(projectdir)/include/sqlite")
diff --git a/lib_fiber/c/xmake.lua b/lib_fiber/c/xmake.lua
index f70383beb..b3ca8a34b 100644
--- a/lib_fiber/c/xmake.lua
+++ b/lib_fiber/c/xmake.lua
@@ -16,5 +16,5 @@ target("fiber")
 
     -- add flags
     add_cxflags("-std=gnu99")
-    add_defines("USE_JMP")
+    add_defines("DUSE_BOOST_JMP")
 
diff --git a/lib_fiber/cpp/xmake.lua b/lib_fiber/cpp/xmake.lua
index d817619e1..55dda613a 100644
--- a/lib_fiber/cpp/xmake.lua
+++ b/lib_fiber/cpp/xmake.lua
@@ -8,7 +8,8 @@ target("fiber_cpp")
     add_deps("fiber", "acl_cpp", "acl")
 
     -- add source files
-    add_files("src/**.cpp")
+    add_files("src/*.cpp")
+    add_files("src/keeper/*.cpp")
 
     -- add include directories
     add_includedirs("src")
@@ -16,6 +17,7 @@ target("fiber_cpp")
 
     -- add headers
     add_headerfiles("include/(**.h)", "include/(**.hpp)")
+    add_includedirs("$(projectdir)/lib_acl/src/master")
 
 
 
diff --git a/xmake.lua b/xmake.lua
index ddcf8f459..33327c974 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -72,7 +72,7 @@ end
 if not is_plat("windows") then
     add_cflags("-Wshadow",
             "-Wpointer-arith",
-            "-Waggregate-return",
+            --"-Waggregate-return",
             "-Wmissing-prototypes",
             "-Wno-long-long",
             "-Wuninitialized",
@@ -80,9 +80,9 @@ if not is_plat("windows") then
             "-fdata-sections",
             "-ffunction-sections",
             "-fPIC",
-            "-fno-rtti",
-            "-fno-exceptions",
-            "-fomit-frame-pointer"
+            -- "-fno-rtti",
+            "-fomit-frame-pointer",
+            "-fno-exceptions"
             )
     add_cxxflags("-Wshadow",
             "-Wpointer-arith",
@@ -93,11 +93,13 @@ if not is_plat("windows") then
             "-fPIC",
             "-fno-rtti",
             "-fno-exceptions",
+	    "-fexceptions",
+	    "-fpermissive",
             "-fomit-frame-pointer"
             )
 
     if is_kind("static") then
-    	add_cxflags("-fvisibility-inlines-hidden")
+    	--add_cxflags("-fvisibility-inlines-hidden")
 
         --add_cflags("-flto")
         --add_cxxflags("-flto")
@@ -115,14 +117,14 @@ if not is_plat("windows") then
     add_defines("ANDROID")
     add_defines("NDEBUG")
     add_defines("acl_cpp_EXPORTS")
-    add_cflags("fno-addrsig")
-    add_cxxflags("fno-addrsig")
+    --add_cflags("fno-addrsig")
+    --add_cflags("-fno-addrsig")
+    --add_cxxflags("fno-addrsig")
+    --add_cxxflags("-fno-addrsig")
     --add_cflags("-MD", "-MT", "-MF")
     --add_cxxflags("-MD", "-MT", "-MF")
     add_cflags("-no-canonical-prefixes")
     add_cxxflags("-no-canonical-prefixes")
-    add_cflags("-fno-addrsig")
-    add_cxxflags("-fno-addrsig")
 end
 
 -- include project sources