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 93d90d2832f9eee212c0661e4ff29a8b5e3740ef..97303a1a13ad56536cf655588943f376bef99956 100644 (file)
--- 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 66dc8345700b6d727dc4f2d27a5ddd166793cd28..31b8ef390e03f4609302cc8d5bedce1e2c9a6cb5 100644 (file)
--- 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 66dc8345700b6d727dc4f2d27a5ddd166793cd28..31b8ef390e03f4609302cc8d5bedce1e2c9a6cb5 100644 (file)
--- 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 a5c483e3f42cb97a74c5a0be7b0ca0282aa30181..25b07861b999793247f32c3321e285fd4ad30258 100644 (file)
--- 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 4fbc68df435fedc8c3876626c3bda53b63dd99c9..2811c5c9788912461536477d8590e1bef3c5f5d2 160000 (submodule)
--- a/util
+++ b/util
@@ -1 +1 @@
-Subproject commit 4fbc68df435fedc8c3876626c3bda53b63dd99c9
+Subproject commit 2811c5c9788912461536477d8590e1bef3c5f5d2