commit 8e4434f

Merge remote-tracking branch 'origin/master'

 1@@ -1,3 +1,4 @@
 2+
 3 project(
 4 	'Magnolia',
 5 	'c',
 6@@ -14,6 +15,8 @@ zlib_dep = dependency('zlib')
 7 libtls_sp = subproject('libtls-bearssl', default_options: [ 'default_library=static' ])
 8 tls_dep = libtls_sp.get_variable('libtls_dep')
 9 bearssl_dep = cc.find_library('bearssl')
10+
11+
12 renderer_backend = get_option('renderer')
13 
14 sources = [
15@@ -34,7 +37,7 @@ sources = [
16 ]
17 
18 include_dirs = [
19-	include_directories('include'),
20+	include_directories('include', '/usr/local/include'),
21 ]
22 
23 vendor_inc = [
24@@ -111,14 +114,23 @@ deps = [
25 	tls_dep,
26 	bearssl_dep,
27 	mgmath_dep,
28-	renderer_dep,
29+	renderer_dep
30 ]
31 
32+
33+# illumos needs extra libraries before it links
34+if host_machine.system() == 'sunos'
35+  extra_libs = ['-lsocket', '-lnsl']
36+else
37+  extra_libs = []
38+endif
39+
40 executable(
41 	'magnolia',
42 	sources,
43 	include_directories: include_dirs,
44 	dependencies: deps,
45 	c_args: renderer_c_args,
46+        link_args: extra_libs,
47 	override_options: [ 'c_std=c99' ],
48 )

1@@ -6,7 +6,7 @@
2 #if defined(__linux__)
3 #include <sys/random.h>
4 #elif defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || \
5-    defined(__DragonFly__)
6+    defined(__DragonFly__) || defined(__illumos__)
7 #include <stdlib.h>
8 #elif defined(_WIN32)
9 /* TODO: Windows shi*/