Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

diff --git a/appveyor.yml b/appveyor.yml
index d1fb476..bcd819e 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -32,13 +32,13 @@ install:
 - cpanm --notest --quiet IPC::Run
 # Lua 
 #- choco install lua53
-# Cmake
-- choco install cmake
+# Basic dependencies: gcc and Cmake
+- choco install mingw cmake
 - rename "C:\Program Files\Git\usr\bin\sh.exe" "sh-ignored.exe"
 
 build_script:
 - cmake -G "MinGW Makefiles" -Denable_lua=OFF -Denable_java=ON -Denable_smpi=OFF -Denable_mallocators=OFF -Denable_lto=OFF .
-- make VERBOSE=1
+- mingw32-make VERBOSE=1
 - cd C:/projects/simgrid/examples/java && java -classpath ".;../../simgrid.jar" masterslave.Masterslave ../platforms/platform.xml masterslave/masterslaveDeployment.xml || true
 
 # I cant use the cmake test because of the following error: