Fixed building using system utf8proc

makefile

@@ -64,6 +64,7 @@
 # USE_SYSTEM_LIB_PORTMIDI = 1
 # USE_SYSTEM_LIB_PORTAUDIO = 1
 # USE_BUNDLED_LIB_SDL2 = 1
+# USE_SYSTEM_LIB_UTF8PROC = 1
 
 # MESA_INSTALL_ROOT = /opt/mesa
 # SDL_INSTALL_ROOT = /opt/sdl2
@@ -460,6 +461,10 @@ ifdef USE_SYSTEM_LIB_PORTAUDIO
 PARAMS += --with-system-portaudio='$(USE_SYSTEM_LIB_PORTAUDIO)'
 endif
 
+ifdef USE_SYSTEM_LIB_UTF8PROC
+PARAMS += --with-system-utf8proc='$(USE_SYSTEM_LIB_UTF8PROC)'
+endif
+
 # reverse logic for this one
 
 ifdef USE_BUNDLED_LIB_SDL2

scripts/extlib.lua

@@ -14,6 +14,7 @@ local extlibs = {
 	portmidi   = { "portmidi",  "3rdparty/portmidi/pm_common" },
 	portaudio  = { "portaudio", "3rdparty/portaudio/include" },
 	lua        = { "lua",       "3rdparty/lua/src" },
+	utf8proc   = { "utf8proc",  "3rdparty/utf8proc" },
 }
 
 -- system lib options
@@ -57,6 +58,11 @@ newoption {
 	description = "Use system LUA library",
 }
 
+newoption {
+	trigger = "with-system-utf8proc",
+	description = "Use system utf8proc library",
+}
+
 -- build helpers
 function ext_lib(lib)
 	local opt = _OPTIONS["with-system-" .. lib]

scripts/src/lib.lua

@@ -22,6 +22,7 @@ project "utils"
 		ext_includedir("expat"),
 		ext_includedir("zlib"),
 		ext_includedir("flac"),
+		ext_includedir("utf8proc"),
 	}
 
 	files {

src/lib/util/unicode.cpp

@@ -15,7 +15,7 @@
 #define UTF8PROC_DLLEXPORT
 #endif
 
-#include "utf8proc/utf8proc.h"
+#include <utf8proc.h>
 
 #include <codecvt>
 #include <locale>