Skip to content

Commit bec34cc

Browse files
Zardoz89Zardoz89
committed
Merge pull request #52 from Zardoz89/fix_appveyour
Fix appveyour
2 parents ffbcdaf + 89303a5 commit bec34cc

File tree

10 files changed

+36
-29
lines changed

10 files changed

+36
-29
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ This repo contains of the Trillek Virtual Computer lib and some extra tools, inc
99

1010
| GNU/Linux | Windows (VStudio 2012) |
1111
|--------------------------------------------------|-------------------------|
12-
| [![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) |
12+
| [![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) |
1313

1414
COMPILING
1515
---------

‎appveyor.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
# version format
3-
version: 1.0.{build}
3+
version: 0.5.0 {branch}-{build}
44

55
# branches to build
66
branches:
@@ -24,10 +24,17 @@ clone_folder: c:\projects\trillek-vcomputer-module
2424

2525
# scripts that run after cloning repository
2626
install:
27+
- cmd: cd c:\projects\trillek-vcomputer-module\
2728
- ps: c:\projects\trillek-vcomputer-module\prebuild.ps1
2829

2930
# build Configuration, i.e. Debug, Release, etc.
3031
configuration: Debug
3132

3233
build_script:
34+
- cmd: cd c:\projects\trillek-vcomputer-module\
3335
- ps: c:\projects\trillek-vcomputer-module\build.ps1
36+
37+
test_script:
38+
- cmd: cd c:\projects\trillek-vcomputer-module\bin\Debug
39+
- cmd: dir
40+
- cmd: unit_test.exe

‎build.ps1‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
$env:GTEST_ROOT = $PWD.Path + "\gtest-1.7.0\"
2-
cmake -G "Visual Studio 12" -DCMAKE_BUILD_TYPE=Debug -DBUILD_TOOLS_VCOMPUTER=False .
1+
cmake -version
32

4-
msbuild VCOMPUTER.sln /p:Configuration=Debug /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
3+
cmake -G "Visual Studio 12" -DBUILD_TOOLS_VCOMPUTER=False .
54

6-
ctest -VV
5+
msbuild VCOMPUTER.sln /p:Configuration=Debug /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
76

‎cmake/FindAlure.cmake‎ renamed to ‎cmake/FindALURE.cmake‎

File renamed without changes.

‎cmake/FindGTEST.cmake‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@ IF (GTEST_INCLUDE_DIR)
1212
SET(GTEST_FIND_QUIETLY TRUE)
1313
ENDIF (GTEST_INCLUDE_DIR)
1414

15-
FIND_PATH( GTEST_INCLUDE_DIR
16-
NAMES gtest/gtest.h
17-
HINTS
15+
FIND_PATH( GTEST_INCLUDE_DIR
16+
NAMES gtest/gtest.h
17+
HINTS
1818
$ENV{GTEST_ROOT}/include
1919
${GTEST_ROOT}/include
20-
PATHS /usr/install
21-
PATH_SUFFIXES gtest-1.7.0/include gtest-1.7.0)
20+
PATHS /usr/install
21+
PATH_SUFFIXES gtest-1.7.0/include gtest-1.7.0)
2222

23-
FIND_LIBRARY( GTEST_LIBRARY
24-
NAMES gtest
25-
HINTS
26-
$ENV{GTEST_ROOT}
27-
${GTEST_ROOT}
28-
PATHS /usr/lib /usr/lib64 /usr/lib32 /usr/local/lib
29-
PATH_SUFFIXES x86 x64 amd64 lib64)
23+
FIND_LIBRARY( GTEST_LIBRARY
24+
NAMES gtest
25+
HINTS
26+
$ENV{GTEST_ROOT}
27+
${GTEST_ROOT}
28+
PATHS /usr/lib /usr/lib64 /usr/lib32 /usr/local/lib
29+
PATH_SUFFIXES x86 x64 amd64 lib64)
3030

3131
# Per-recommendation
3232
SET(GTEST_INCLUDE_DIRS "${GTEST_INCLUDE_DIR}")

‎cmake/FindGTEST_MAIN.cmake‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ IF (GTEST_MAIN_INCLUDE_DIR)
1212
ENDIF (GTEST_MAIN_INCLUDE_DIR)
1313

1414

15-
FIND_LIBRARY( GTEST_MAIN_LIBRARY
16-
NAMES gtest_main
17-
HINTS
18-
$ENV{GTEST_ROOT}
19-
${GTEST_ROOT}
20-
PATHS /usr/lib /usr/lib64 /usr/lib32 /usr/local/lib
21-
PATH_SUFFIXES x86 x64 amd64 lib64)
15+
FIND_LIBRARY( GTEST_MAIN_LIBRARY
16+
NAMES gtest_main
17+
HINTS
18+
$ENV{GTEST_ROOT}
19+
${GTEST_ROOT}
20+
PATHS /usr/lib /usr/lib64 /usr/lib32 /usr/local/lib
21+
PATH_SUFFIXES x86 x64 amd64 lib64)
2222

2323
# Per-recommendation
2424
SET(GTEST_MAIN_LIBRARIES "${GTEST_MAIN_LIBRARY}")

‎cmake/FindOpenAl.cmake‎ renamed to ‎cmake/FindOpenAL.cmake‎

File renamed without changes.

‎prebuild.ps1‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ new-item build -type director
1111

1212
pushd
1313

14-
Start-FileDownload 'https://googletest.googlecode.com/files/gtest-1.7.0.zip'
15-
7z -y x gtest-1.7.0.zip
16-
17-
$env:GTEST_ROOT = $PWD.Path + "\gtest-1.7.0\"
14+
Start-FileDownload 'http://cpu.zardoz.es/trillek-win32-lib.zip'
15+
7z -y x trillek-win32-lib.zip
1816

1917
popd

‎tests/vcomputer_test.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ class VComputer_test : public ::testing::Test {
6161
trillek::DWord addr_id[3];
6262

6363
virtual void SetUp() {
64+
std::memset((void*)rom, 0, 1024);
6465
std::memmove ((void*)rom, (void*)dumy_str, std::strlen(dumy_str));
6566
vc.SetROM(this->rom, 1024);
6667
addr_id[0] = -1;

‎tools/config_main.hpp.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232

3333
#include <GLFW/glfw3.h>
3434

35+
#ifndef GLM_FORCE_RADIANS
3536
#define GLM_FORCE_RADIANS // Removes anoying messages of depracated angles on degress
37+
#endif
3638
#include <glm/glm.hpp>
3739
#include <glm/ext.hpp>
3840

0 commit comments

Comments
 (0)