From: fennecdjay <astor.jeremie@wanadoo.fr>
Date: Thu, 14 Mar 2019 22:18:07 +0000 (+0100)
Subject: :fire: ... (win)
X-Git-Tag: nightly~2690
X-Git-Url: http://10.11.0.4:5575/?a=commitdiff_plain;h=827383f0885d53b6a825f724c08cadee3694df10;p=gwion.git

:fire: ... (win)
---

diff --git a/.travis.yml b/.travis.yml
index 631f6ec2..40e23ae6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,13 +37,13 @@ env:
 
 matrix:
   allow_failures:
-   - os:
+   - os: windows
 #     - osx
-     - windows
 
 compiler:
   - gcc
 #  - clang
+
 install:
   - if [ $TRAVIS_JOB_NUMBER = ${TRAVIS_BUILD_NUMBER}.1  ]; then gem install coveralls-lcov; fi;
   - if [ $(uname) != "Linux" ] && [ $(uname) != "Darwin" ]; then 
diff --git a/Makefile b/Makefile
index 09067f12..7520e75c 100644
--- a/Makefile
+++ b/Makefile
@@ -47,6 +47,8 @@ endif
 
 ifeq (${BUILD_ON_WINDOWS}, 1)
 CFLAGS += -DBUILD_ON_WINDOWS -D_XOPEN_SOURCE=700
+else
+CFLAGS += -ldl
 endif
 
 # add directories
diff --git a/config.mk.orig b/config.mk.orig
index aa91a378..cb411034 100644
--- a/config.mk.orig
+++ b/config.mk.orig
@@ -1,7 +1,7 @@
 # handle base options
 PRG ?=gwion
 PREFIX ?=/usr/local
-LDFLAGS += -lm -ldl
+LDFLAGS += -lm
 CFLAGS += -Iinclude -Iutil/include -Iast/include -D_GNU_SOURCE
 
 # handle boolean options