From 4d229559fbdb59334be678c4601a5b593862245e Mon Sep 17 00:00:00 2001 From: odalet Date: Sat, 24 Sep 2016 17:03:23 +0200 Subject: [PATCH 1/5] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index d732c72e7..4280ddc79 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,7 +30,7 @@ install: build_script: - cd c:\projects\assimp - cmake CMakeLists.txt -G "Visual Studio %Configuration%" - - msbuild /m /p:Configuration=Release /p:Platform="Win32" Assimp.sln + - if "%platform%" EQU "x64" (msbuild /m /p:Configuration=Release /p:Platform="x64" Assimp.sln) else (msbuild /m /p:Configuration=Release /p:Platform="Win32" Assimp.sln) after_build: - 7z a assimp.7z c:\projects\assimp\bin\release\* c:\projects\assimp\lib\release\* From 19466d7952339c439343125e2781df4c211aa013 Mon Sep 17 00:00:00 2001 From: odalet Date: Sat, 24 Sep 2016 17:21:49 +0200 Subject: [PATCH 2/5] Update appveyor.yml --- appveyor.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 4280ddc79..85d5246e1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,9 +28,16 @@ install: - call c:\projects\assimp\scripts\appveyor\compiler_setup.bat build_script: - - cd c:\projects\assimp - - cmake CMakeLists.txt -G "Visual Studio %Configuration%" - - if "%platform%" EQU "x64" (msbuild /m /p:Configuration=Release /p:Platform="x64" Assimp.sln) else (msbuild /m /p:Configuration=Release /p:Platform="Win32" Assimp.sln) +build_script: +- cmd: >- + cd c:\projects\assimp + if "%platform%" equ "x64" ( + cmake CMakeLists.txt -G "Visual Studio %Configuration% Win64" + msbuild /m /p:Configuration=Release /p:Platform="x64" Assimp.sln + ) else ( + cmake CMakeLists.txt -G "Visual Studio %Configuration%" + msbuild /m /p:Configuration=Release /p:Platform="Win32" Assimp.sln + ) after_build: - 7z a assimp.7z c:\projects\assimp\bin\release\* c:\projects\assimp\lib\release\* From d4332b4d7155b8449d24839c768018d54023d894 Mon Sep 17 00:00:00 2001 From: odalet Date: Sat, 24 Sep 2016 17:22:24 +0200 Subject: [PATCH 3/5] Update appveyor.yml --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 85d5246e1..833c3763b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,7 +27,6 @@ install: # Make compiler command line tools available - call c:\projects\assimp\scripts\appveyor\compiler_setup.bat -build_script: build_script: - cmd: >- cd c:\projects\assimp From 14254bf443d50e59911c5f8cfeed31f45be503b1 Mon Sep 17 00:00:00 2001 From: odalet Date: Sat, 24 Sep 2016 17:23:48 +0200 Subject: [PATCH 4/5] Update appveyor.yml --- appveyor.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 833c3763b..0ba7a4901 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,13 +29,21 @@ install: build_script: - cmd: >- + cd c:\projects\assimp + if "%platform%" equ "x64" ( + cmake CMakeLists.txt -G "Visual Studio %Configuration% Win64" + msbuild /m /p:Configuration=Release /p:Platform="x64" Assimp.sln + ) else ( + cmake CMakeLists.txt -G "Visual Studio %Configuration%" + msbuild /m /p:Configuration=Release /p:Platform="Win32" Assimp.sln + ) after_build: From 00e931a99124ce241818a0c759c5165fb9fe01b7 Mon Sep 17 00:00:00 2001 From: odalet Date: Sat, 24 Sep 2016 17:26:59 +0200 Subject: [PATCH 5/5] Update appveyor.yml --- appveyor.yml | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0ba7a4901..e33202409 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,23 +28,11 @@ install: - call c:\projects\assimp\scripts\appveyor\compiler_setup.bat build_script: -- cmd: >- - - cd c:\projects\assimp - - if "%platform%" equ "x64" ( - - cmake CMakeLists.txt -G "Visual Studio %Configuration% Win64" - - msbuild /m /p:Configuration=Release /p:Platform="x64" Assimp.sln - - ) else ( - - cmake CMakeLists.txt -G "Visual Studio %Configuration%" - - msbuild /m /p:Configuration=Release /p:Platform="Win32" Assimp.sln - - ) +- cd c:\projects\assimp +- if "%platform%" equ "x64" (cmake CMakeLists.txt -G "Visual Studio %Configuration% Win64") +- if "%platform%" equ "x86" (cmake CMakeLists.txt -G "Visual Studio %Configuration%") +- if "%platform%" equ "x64" (msbuild /m /p:Configuration=Release /p:Platform="x64" Assimp.sln) +- if "%platform%" equ "x86" (msbuild /m /p:Configuration=Release /p:Platform="Win32" Assimp.sln) after_build: - 7z a assimp.7z c:\projects\assimp\bin\release\* c:\projects\assimp\lib\release\*