Travis fix, simplifying appveyor.

This commit is contained in:
Tadas Baltrusaitis
2018-05-06 13:37:31 +01:00
parent e0ba3345b7
commit c373db3b7f
3 changed files with 7 additions and 4 deletions

View File

@@ -69,6 +69,10 @@ script:
- wget https://www.dropbox.com/s/k7bj804cyiu474t/cen_patches_0.35_of.dat?dl=1
- wget https://www.dropbox.com/s/ixt4vkbmxgab1iu/cen_patches_0.50_of.dat?dl=1
- wget https://www.dropbox.com/s/2t5t1sdpshzfhpj/cen_patches_1.00_of.dat?dl=1
- mv cen_patches_0.25_of.dat?dl=1 cen_patches_0.25_of.dat
- mv cen_patches_0.35_of.dat?dl=1 cen_patches_0.35_of.dat
- mv cen_patches_0.50_of.dat?dl=1 cen_patches_0.50_of.dat
- mv cen_patches_1.00_of.dat?dl=1 cen_patches_1.00_of.dat
- ls
- cd ../../../../
- mkdir build

View File

@@ -35,8 +35,7 @@ test_script:
- cmd: if exist Debug (cd Debug)
- cmd: if exist Release (cd Release)
- cmd: dir
- cmd: if exist "../samples" (FaceLandmarkImg.exe -fdir "../samples/" -out_dir "./demo_img/" -q) else (FaceLandmarkImg.exe -fdir "../../samples/" -out_dir "./demo_img/" -q)
- cmd: if exist "../samples" (FaceLandmarkImg.exe -inroot ../samples -f sample1.jpg -out_dir out_data -of sample1.pts -q) else (FaceLandmarkImg.exe -inroot ../../samples -f sample1.jpg -out_dir out_data -q)
- cmd: if exist "../samples" (FaceLandmarkImg.exe -inroot ../samples -f sample1.jpg -out_dir out_data -q) else (FaceLandmarkImg.exe -inroot ../../samples -f sample1.jpg -out_dir out_data -q)
- cmd: if exist "../samples" (FaceLandmarkVidMulti.exe -inroot ../samples -f multi_face.avi -q) else (FaceLandmarkVidMulti.exe -inroot ../../samples -f multi_face.avi -q)
- cmd: if exist "../samples" (FeatureExtraction.exe -f "../samples/default.wmv" -q) else (FeatureExtraction.exe -f "../../samples/default.wmv" -q)
- cmd: if exist "../samples" (FeatureExtraction.exe -f "../samples/default.wmv" -simsize 200 -simscale 0.5 -q) else (FeatureExtraction.exe -f "../../samples/default.wmv" -simsize 200 -simscale 0.5 -ov feat_track.avi -q)

View File

@@ -9,7 +9,7 @@ namespace dlib
{
namespace blas_bindings
{
#ifdef DLIB_USE_BLAS
#ifndef CBLAS_H
extern "C"
{
@@ -28,7 +28,7 @@ namespace dlib
// ------------------------------------------------------------------------------------
#endif // if not CBLAS_H
#endif // if DLIB_USE_BLAS
/* Purpose */
/* ======= */