Fixup

5 files changed, 17 insertions, 12 deletions

diff --git a/core/src/utf8proc/xmake.lua b/core/src/utf8proc/xmake.lua
new file mode 100644
index 000000000..17d84f505
--- /dev/null
+++ b/core/src/utf8proc/xmake.lua
@@ -0,0 +1,5 @@
+target("utf8proc")
+    set_kind("static")
+    add_defines("UTF8PROC_STATIC")
+    add_includedirs("utf8proc", {public = true})
+    add_files("utf8proc/utf8proc.c")
diff --git a/core/src/utf8proc/xmake.sh b/core/src/utf8proc/xmake.sh
new file mode 100644
index 000000000..56e0b0db6
--- /dev/null
+++ b/core/src/utf8proc/xmake.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+target "utf8proc"
+    set_kind "static"
+    set_default false
+    add_defines "UTF8PROC_STATIC"
+    add_includedirs "utf8proc" "{public}"
+    add_files "utf8proc/utf8proc.c"
+
diff --git a/core/src/xmake/xmake.sh b/core/src/xmake/xmake.sh
index 291001306..11f33ab25 100755
--- a/core/src/xmake/xmake.sh
+++ b/core/src/xmake/xmake.sh
@@ -22,7 +22,7 @@ target "xmake"
             fi
         fi
     else
-        local libs="lua_cjson lz4 sv tbox"
+        local libs="lua_cjson lz4 sv tbox utf8proc"
         for lib in $libs; do
             add_deps "$lib"
         done
diff --git a/core/xmake.lua b/core/xmake.lua
index 7b1ae6cbd..386dc9829 100644
--- a/core/xmake.lua
+++ b/core/xmake.lua
@@ -132,7 +132,7 @@ if is_plat("windows") then
 end
 
 -- add projects
-includes("src/sv", "src/lz4", "src/xmake", "src/cli")
+includes("src/sv", "src/lz4", "src/xmake", "src/cli", "src/utf8proc")
 if namespace then
     namespace("tbox", function ()
         includes("src/tbox")
diff --git a/core/xmake.sh b/core/xmake.sh
index e89547d74..0ece092a5 100755
--- a/core/xmake.sh
+++ b/core/xmake.sh
@@ -18,16 +18,6 @@ if is_plat "solaris"; then
     add_defines "_XOPEN_SOURCE=600"
 fi
 
-if [ -f "scripts/xrepo.sh" ]; then
-    xrepo_cflags=$(bash scripts/xrepo.sh fetch --cflags utf8proc 2>/dev/null)
-    xrepo_ldflags=$(bash scripts/xrepo.sh fetch --ldflags utf8proc 2>/dev/null)
-    if [ -n "$xrepo_cflags" ]; then
-        add_cxflags "${xrepo_cflags}"
-    fi
-    if [ -n "$xrepo_ldflags" ]; then
-        add_ldflags "${xrepo_ldflags}"
-    fi
-fi
 
 # disable some compiler errors
 if is_plat "macosx"; then
@@ -246,6 +236,7 @@ if ! has_config "external"; then
     includes "src/lz4"
     includes "src/sv"
     includes "src/tbox"
+    includes "src/utf8proc"
 fi
 includes "src/xmake"
 includes "src/cli"