From: valkarias <70243457+valkarias@users.noreply.github.com>
Date: Thu, 8 Jul 2021 19:38:26 +0000 (+0200)
Subject: Windows gwion portability improvements. (#229)
X-Git-Tag: nightly~543^2
X-Git-Url: http://10.10.0.4:5575/?a=commitdiff_plain;h=ba1217676f3042691abba9d771513409f4bb24ba;p=gwion.git

Windows gwion portability improvements. (#229)

* :wrench: Improve gwion portability

* :wrench: windows improvements

* gwion itself

* :wrench: windows changes

* remove log

* to gwion

* old ast

* make
---

diff --git a/src/plug.c b/src/plug.c
index 93d90d28..97303a1a 100644
--- a/src/plug.c
+++ b/src/plug.c
@@ -1,10 +1,9 @@
 #ifndef BUILD_ON_WINDOWS
-#include <glob.h>
-#include <dlfcn.h>
-#include <limits.h>
-#else
-#include <windows.h>
+  #include <glob.h>
+  #include <dlfcn.h>
+  #include <limits.h>
 #endif
+
 #include "gwion_util.h"
 #include "gwion_ast.h"
 #include "gwion_env.h"
diff --git a/tests/driver/Makefile b/tests/driver/Makefile
index 66dc8345..31b8ef39 100644
--- a/tests/driver/Makefile
+++ b/tests/driver/Makefile
@@ -13,7 +13,6 @@ else
 ifeq ($(shell uname), Linux)
 LDFLAGS += -shared
 else
-CFLAGS += -DBUILD_ON_WINDOWS=1
 LDFLAGS += -shared -lpsapi -fPIC -Wl,--export-all -Wl,--enable-auto-import
 LDFLAGS += -L../../ -lgwion
 LDLAGS += ../../libgwion.dll.a
diff --git a/tests/module/Makefile b/tests/module/Makefile
index 66dc8345..31b8ef39 100644
--- a/tests/module/Makefile
+++ b/tests/module/Makefile
@@ -13,7 +13,6 @@ else
 ifeq ($(shell uname), Linux)
 LDFLAGS += -shared
 else
-CFLAGS += -DBUILD_ON_WINDOWS=1
 LDFLAGS += -shared -lpsapi -fPIC -Wl,--export-all -Wl,--enable-auto-import
 LDFLAGS += -L../../ -lgwion
 LDLAGS += ../../libgwion.dll.a
diff --git a/tests/plug/Makefile b/tests/plug/Makefile
index a5c483e3..25b07861 100644
--- a/tests/plug/Makefile
+++ b/tests/plug/Makefile
@@ -13,7 +13,6 @@ else
 ifeq ($(shell uname), Linux)
 LDFLAGS += -shared
 else
-CFLAGS += -DBUILD_ON_WINDOWS=1
 LDFLAGS += -shared -lpsapi -fPIC -Wl,--export-all -Wl,--enable-auto-import
 LDFLAGS += -L../../ -lgwion
 LDLAGS += ../../libgwion.dll.a
diff --git a/util b/util
index 4fbc68df..2811c5c9 160000
--- a/util
+++ b/util
@@ -1 +1 @@
-Subproject commit 4fbc68df435fedc8c3876626c3bda53b63dd99c9
+Subproject commit 2811c5c9788912461536477d8590e1bef3c5f5d2