From 4064c563c9966b171fba7e6165e06ed3b846210d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 4 Sep 2016 01:36:36 +0200 Subject: [PATCH] package/ci: build for x64 on MSVC. --- package/ci/appveyor-desktop.bat | 4 ++-- package/ci/appveyor-rt.bat | 14 +++++++------- package/ci/appveyor.yml | 3 +-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/package/ci/appveyor-desktop.bat b/package/ci/appveyor-desktop.bat index 427cf6647..fb262784d 100644 --- a/package/ci/appveyor-desktop.bat +++ b/package/ci/appveyor-desktop.bat @@ -1,5 +1,5 @@ -call "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat" || exit /b -set PATH=%APPVEYOR_BUILD_FOLDER%/openal/bin/Win32;%APPVEYOR_BUILD_FOLDER%\deps\bin;%PATH% +call "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat" x64 || exit /b +set PATH=%APPVEYOR_BUILD_FOLDER%/openal/bin/Win64;%APPVEYOR_BUILD_FOLDER%\deps\bin;%PATH% rem Build Corrade git clone --depth 1 git://github.com/mosra/corrade.git || exit /b diff --git a/package/ci/appveyor-rt.bat b/package/ci/appveyor-rt.bat index d1c33ad71..760f1d64f 100644 --- a/package/ci/appveyor-rt.bat +++ b/package/ci/appveyor-rt.bat @@ -1,4 +1,4 @@ -call "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat" || exit /b +call "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat" x64 || exit /b set PATH=%APPVEYOR_BUILD_FOLDER%\deps-native\bin;%PATH% rem Build ANGLE @@ -39,7 +39,7 @@ cmake .. ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DWITH_INTERCONNECT=OFF ^ -DBUILD_STATIC=ON ^ - -G "Visual Studio 14 2015" || exit /b + -G "Visual Studio 14 2015" -A x64 || exit /b cmake --build . --config Release --target install -- /m /v:m || exit /b cd .. || exit /b @@ -52,13 +52,13 @@ cmake .. ^ -DCMAKE_SYSTEM_VERSION=10.0 ^ -DCORRADE_RC_EXECUTABLE=%APPVEYOR_BUILD_FOLDER%/deps-native/bin/corrade-rc.exe ^ -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/deps ^ - -DEGL_LIBRARY=%APPVEYOR_BUILD_FOLDER%/angle/winrt/10/src/Release_Win32/lib/libEGL.lib ^ + -DEGL_LIBRARY=%APPVEYOR_BUILD_FOLDER%/angle/winrt/10/src/Release_x64/lib/libEGL.lib ^ -DEGL_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%/angle/include ^ - -DOPENGLES2_LIBRARY=%APPVEYOR_BUILD_FOLDER%/angle/winrt/10/src/Release_Win32/lib/libGLESv2.lib ^ + -DOPENGLES2_LIBRARY=%APPVEYOR_BUILD_FOLDER%/angle/winrt/10/src/Release_x64/lib/libGLESv2.lib ^ -DOPENGLES2_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%/angle/include ^ - -DOPENGLES3_LIBRARY=%APPVEYOR_BUILD_FOLDER%/angle/winrt/10/src/Release_Win32/lib/libGLESv2.lib ^ + -DOPENGLES3_LIBRARY=%APPVEYOR_BUILD_FOLDER%/angle/winrt/10/src/Release_x64/lib/libGLESv2.lib ^ -DOPENGLES3_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%/angle/include ^ - -DSDL2_LIBRARY=%APPVEYOR_BUILD_FOLDER%/SDL/VisualC-WinRT/UWP_VS2015/Release/SDL-UWP/SDL2.lib ^ + -DSDL2_LIBRARY=%APPVEYOR_BUILD_FOLDER%/SDL/VisualC-WinRT/UWP_VS2015/X64/Release/SDL-UWP/SDL2.lib ^ -DSDL2_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%/SDL/include ^ -DWITH_AUDIO=OFF ^ -DWITH_SDL2APPLICATION=ON ^ @@ -72,5 +72,5 @@ cmake .. ^ -DBUILD_TESTS=ON ^ -DBUILD_STATIC=ON ^ -DBUILD_PLUGINS_STATIC=ON ^ - -G "Visual Studio 14 2015" || exit /b + -G "Visual Studio 14 2015" -A x64 || exit /b cmake --build . --config Release -- /m /v:m || exit /b diff --git a/package/ci/appveyor.yml b/package/ci/appveyor.yml index 9f2bb1f23..fe32a6125 100644 --- a/package/ci/appveyor.yml +++ b/package/ci/appveyor.yml @@ -30,8 +30,7 @@ install: # OpenAL - IF NOT "%TARGET%" == "rt" IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\openal-soft-1.17.2-bin.zip appveyor DownloadFile http://kcat.strangesoft.net/openal-binaries/openal-soft-1.17.2-bin.zip - IF NOT "%TARGET%" == "rt" 7z x openal-soft-1.17.2-bin.zip && ren openal-soft-1.17.2-bin openal && echo [General] > %APPDATA%/alsoft.ini & echo drivers=null >> %APPDATA%/alsoft.ini -- IF "%TARGET%" == "desktop" IF "%COMPILER%" == "msvc" ren openal\bin\Win32\soft_oal.dll OpenAL32.dll -- IF "%TARGET%" == "desktop" IF "%COMPILER%" == "mingw" ren openal\bin\Win64\soft_oal.dll OpenAL32.dll +- IF "%TARGET%" == "desktop" ren openal\bin\Win64\soft_oal.dll OpenAL32.dll # SDL2 - IF "%TARGET%" == "desktop" IF "%COMPILER%" == "msvc" IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\SDL2-devel-2.0.4-VC.zip appveyor DownloadFile http://www.libsdl.org/release/SDL2-devel-2.0.4-VC.zip