Merge pull request #52 from Zardoz89/fix_appveyour

Fix appveyour
trillek-team · Jan 30, 2015 · bec34cc · bec34cc
2 parents ffbcdaf + 89303a5
commit bec34cc
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ This repo contains of the Trillek Virtual Computer lib and some extra tools, inc
 
 | GNU/Linux                                        | Windows (VStudio 2012)  |
 |--------------------------------------------------|-------------------------|
-| [![Build Status](https://travis-ci.org/trillek-team/trillek-vcomputer-module.png?branch=new-version)](https://travis-ci.org/trillek-team/trillek-vcomputer-module) | [![Build status](https://ci.appveyor.com/api/projects/status/25nu8anmfjea1cnb?svg=true)](https://ci.appveyor.com/project/Zardoz89/trillek-vcomputer-module) |
+| [![Build Status](https://travis-ci.org/trillek-team/trillek-vcomputer-module.svg?branch=develop)](https://travis-ci.org/trillek-team/trillek-vcomputer-module) | [![Build status](https://ci.appveyor.com/api/projects/status/420wp0vh8tnsuvjn/branch/develop?svg=true)](https://ci.appveyor.com/project/Zardoz89/trillek-vcomputer-module-r5m16/branch/develop) |
 
 COMPILING
 ---------

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,6 +1,6 @@
 
 # version format
-version: 1.0.{build}
+version: 0.5.0 {branch}-{build}
 
 # branches to build
 branches:
@@ -24,10 +24,17 @@ clone_folder: c:\projects\trillek-vcomputer-module
 
 # scripts that run after cloning repository
 install:
+    - cmd: cd c:\projects\trillek-vcomputer-module\
     - ps: c:\projects\trillek-vcomputer-module\prebuild.ps1
 
 # build Configuration, i.e. Debug, Release, etc.
 configuration: Debug
 
 build_script:
+    - cmd: cd c:\projects\trillek-vcomputer-module\
     - ps: c:\projects\trillek-vcomputer-module\build.ps1
+
+test_script:
+    - cmd: cd c:\projects\trillek-vcomputer-module\bin\Debug
+    - cmd: dir
+    - cmd: unit_test.exe
diff --git a/build.ps1 b/build.ps1
@@ -1,7 +1,6 @@
-$env:GTEST_ROOT = $PWD.Path + "\gtest-1.7.0\"
-cmake -G "Visual Studio 12" -DCMAKE_BUILD_TYPE=Debug -DBUILD_TOOLS_VCOMPUTER=False .
+cmake -version
 
-msbuild VCOMPUTER.sln /p:Configuration=Debug /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+cmake -G "Visual Studio 12" -DBUILD_TOOLS_VCOMPUTER=False .
 
-ctest -VV
+msbuild VCOMPUTER.sln /p:Configuration=Debug /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 
diff --git a/cmake/FindAlure.cmake → cmake/FindALURE.cmake b/cmake/FindAlure.cmake → cmake/FindALURE.cmake
diff --git a/cmake/FindGTEST.cmake b/cmake/FindGTEST.cmake
@@ -12,21 +12,21 @@ IF (GTEST_INCLUDE_DIR)
   SET(GTEST_FIND_QUIETLY TRUE)
 ENDIF (GTEST_INCLUDE_DIR)
 
-FIND_PATH(	GTEST_INCLUDE_DIR
-			NAMES gtest/gtest.h
-      HINTS
+FIND_PATH(  GTEST_INCLUDE_DIR
+    NAMES gtest/gtest.h
+    HINTS
         $ENV{GTEST_ROOT}/include
         ${GTEST_ROOT}/include
-			PATHS /usr/install
-			PATH_SUFFIXES gtest-1.7.0/include gtest-1.7.0)
+    PATHS /usr/install
+    PATH_SUFFIXES gtest-1.7.0/include gtest-1.7.0)
 
-FIND_LIBRARY(	GTEST_LIBRARY
-				NAMES gtest
-        HINTS
-          $ENV{GTEST_ROOT}
-          ${GTEST_ROOT}
-				PATHS /usr/lib /usr/lib64 /usr/lib32 /usr/local/lib
-				PATH_SUFFIXES x86 x64 amd64 lib64)
+FIND_LIBRARY(   GTEST_LIBRARY
+    NAMES gtest
+    HINTS
+        $ENV{GTEST_ROOT}
+        ${GTEST_ROOT}
+    PATHS /usr/lib /usr/lib64 /usr/lib32 /usr/local/lib
+    PATH_SUFFIXES x86 x64 amd64 lib64)
 
 # Per-recommendation
 SET(GTEST_INCLUDE_DIRS "${GTEST_INCLUDE_DIR}")

diff --git a/cmake/FindGTEST_MAIN.cmake b/cmake/FindGTEST_MAIN.cmake
@@ -12,13 +12,13 @@ IF (GTEST_MAIN_INCLUDE_DIR)
 ENDIF (GTEST_MAIN_INCLUDE_DIR)
 
 
-FIND_LIBRARY(	GTEST_MAIN_LIBRARY
-				NAMES gtest_main
-        HINTS
-          $ENV{GTEST_ROOT}
-          ${GTEST_ROOT}
-				PATHS /usr/lib /usr/lib64 /usr/lib32 /usr/local/lib
-				PATH_SUFFIXES x86 x64 amd64 lib64)
+FIND_LIBRARY(   GTEST_MAIN_LIBRARY
+    NAMES gtest_main
+    HINTS
+        $ENV{GTEST_ROOT}
+        ${GTEST_ROOT}
+    PATHS /usr/lib /usr/lib64 /usr/lib32 /usr/local/lib
+    PATH_SUFFIXES x86 x64 amd64 lib64)
 
 # Per-recommendation
 SET(GTEST_MAIN_LIBRARIES    "${GTEST_MAIN_LIBRARY}")

diff --git a/cmake/FindOpenAl.cmake → cmake/FindOpenAL.cmake b/cmake/FindOpenAl.cmake → cmake/FindOpenAL.cmake
diff --git a/prebuild.ps1 b/prebuild.ps1
@@ -11,9 +11,7 @@ new-item build -type director
 
 pushd
 
-Start-FileDownload 'https://googletest.googlecode.com/files/gtest-1.7.0.zip'
-7z -y x gtest-1.7.0.zip
-
-$env:GTEST_ROOT = $PWD.Path + "\gtest-1.7.0\"
+Start-FileDownload 'http://cpu.zardoz.es/trillek-win32-lib.zip'
+7z -y x trillek-win32-lib.zip
 
 popd
diff --git a/tests/vcomputer_test.cpp b/tests/vcomputer_test.cpp
@@ -61,6 +61,7 @@ class VComputer_test : public ::testing::Test {
     trillek::DWord addr_id[3];
 
     virtual void SetUp() {
+      std::memset((void*)rom, 0, 1024);
       std::memmove ((void*)rom, (void*)dumy_str, std::strlen(dumy_str));
       vc.SetROM(this->rom, 1024);
       addr_id[0] = -1;

diff --git a/tools/config_main.hpp.in b/tools/config_main.hpp.in
@@ -32,7 +32,9 @@
 
     #include <GLFW/glfw3.h>
 
+    #ifndef GLM_FORCE_RADIANS
     #define GLM_FORCE_RADIANS  // Removes anoying messages of depracated angles on degress
+    #endif
     #include <glm/glm.hpp>
     #include <glm/ext.hpp>