Skip to content

Commit

Permalink
Build both x86 and x64 platform
Browse files Browse the repository at this point in the history
  • Loading branch information
quangnh89 committed Jul 22, 2016
1 parent ebbaeb5 commit 88119f0
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
7 changes: 3 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,10 @@ clone_folder: c:\projects\TinyAntivirus
environment:
SAMPLE_DIR: c:\projects\TinyAntivirus\tests\samples
CONFIGURATION: Release
PLATFORM: x64
# matrix:
# - PLATFORM: x86
matrix:
- PLATFORM: x86

# - PLATFORM: x64
- PLATFORM: x64


#---------------------------------#
Expand Down
4 changes: 2 additions & 2 deletions ci/windows/build_appveyor.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if "%2" == "" (
)

set generator=Visual Studio 14 2015
if "%1" == "x64" (set generator=%generator% Win64)
if /I "%1" == "x64" (set generator=%generator% Win64)

:: build googletest library
md libs\googletest\googletest\build
Expand All @@ -27,7 +27,7 @@ popd
md libs\zlib\build
pushd libs\zlib\build
set ZLIB_C_FLAGS=
if "%2" == "Release" (set ZLIB_C_FLAGS=/MT)
if /I "%2" == "Release" (set ZLIB_C_FLAGS=/MT)
cmake -G "%generator%" -DCMAKE_CONFIGURATION_TYPES="%2" -DCMAKE_C_FLAGS_RELEASE="%ZLIB_C_FLAGS%" ..
cmake --build . --config "%2"
popd
Expand Down
5 changes: 1 addition & 4 deletions ci/windows/test_appveyor.bat
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
@ECHO OFF
set APP_PATH="%2\Unittests.exe"
if "%1" == "x64" (set APP_PATH="x64\%2\Unittests.exe")
echo "%1"
echo "%2"
echo %APP_PATH%
if /I "%1" == "x64" (set APP_PATH="%1\%2\Unittests.exe")
%APP_PATH% "%SAMPLE_DIR%"

0 comments on commit 88119f0

Please sign in to comment.