From e0948aba7a7e6e366a9dfae731a24f1cf6d44192 Mon Sep 17 00:00:00 2001
From: Snaipe <franklinmathieu@gmail.com>
Date: Thu, 3 Sep 2015 18:31:24 +0200
Subject: [PATCH] Trying to fix dyncall installation on windows

---
 .ci/install-dyncall.bat | 9 +++++++++
 .ci/install-dyncall.sh  | 4 +++-
 appveyor.yml            | 4 ++--
 3 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100755 .ci/install-dyncall.bat

diff --git a/.ci/install-dyncall.bat b/.ci/install-dyncall.bat
new file mode 100755
index 0000000..c983288
--- /dev/null
+++ b/.ci/install-dyncall.bat
@@ -0,0 +1,9 @@
+set repo="https://github.com/Snaipe/dyncall.git"
+set tag="master"
+
+mkdir dependencies
+git clone --branch %tag% --depth 1 %repo% dependencies/dyncall
+cd dependencies/dyncall
+mkdir build && cd build
+cmake -DCMAKE_INSTALL_PREFIX=%LOCAL_INSTALL% -G "NMake Makefiles" ..
+nmake
diff --git a/.ci/install-dyncall.sh b/.ci/install-dyncall.sh
index 142da7d..b880cbd 100755
--- a/.ci/install-dyncall.sh
+++ b/.ci/install-dyncall.sh
@@ -6,7 +6,9 @@ mkdir -p dependencies
 git clone --branch ${tag} --depth 1 ${repo} dependencies/dyncall &&
 (
     cd dependencies/dyncall &&
-    ./configure --prefix=$LOCAL_INSTALL
+    mkdir build &&
+    cd $_ &&
+    cmake -DCMAKE_INSTALL_PREFIX=$LOCAL_INSTALL "$@" .. &&
     make &&
     make install
 )
diff --git a/appveyor.yml b/appveyor.yml
index ca54394..6e43b3e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -28,11 +28,11 @@ install:
   # Hack to make git think it is on the tip of the repo branch
   - 'git checkout -B %APPVEYOR_REPO_BRANCH%'
   # Install dependencies
-  - 'bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; .ci/install-dyncall.sh; true"'
+  - 'bash -lc "cd $APPVEYOR_BUILD_FOLDER; .ci/install-dyncall.sh -G \"MSYS Makefiles\"; true"'
   - 'bash -lc "cd $APPVEYOR_BUILD_FOLDER; .ci/install-libcsptr.sh -G \"MSYS Makefiles\"; true"'
   # We need to manually make since the above command somehow crashes
   - 'cd dependencies/libcsptr/build && make && make install && cd ../../../'
-  - 'cd dependencies/dyncall/build  && make && make install && cd ../../../'
+  - 'cd dependencies/dyncall/build && make && make install && cd ../../../'
   # Configure project
   - 'mkdir build && cd build'
   - 'cmake -DCMAKE_INSTALL_PREFIX=criterion-%APPVEYOR_REPO_TAG_NAME% -DCMAKE_PREFIX_PATH="%LOCAL_INSTALL%" -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug -G "MSYS Makefiles" ..'