From c12e316c0e59b7fe7713c1cc383d9aecf9e779e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 7 Jun 2017 21:53:28 +0200 Subject: [PATCH] package/ci: build GlfwApplication on AppVeyor. --- package/ci/appveyor-desktop.bat | 1 + package/ci/appveyor.yml | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/package/ci/appveyor-desktop.bat b/package/ci/appveyor-desktop.bat index 510be3284..f377c182e 100644 --- a/package/ci/appveyor-desktop.bat +++ b/package/ci/appveyor-desktop.bat @@ -22,6 +22,7 @@ cmake .. ^ -DCMAKE_PREFIX_PATH="%APPVEYOR_BUILD_FOLDER%/SDL;%APPVEYOR_BUILD_FOLDER%/openal" ^ -DWITH_AUDIO=ON ^ -DWITH_SDL2APPLICATION=ON ^ + -DWITH_GLFWAPPLICATION=ON ^ -DWITH_WINDOWLESSWGLAPPLICATION=ON ^ -DWITH_WGLCONTEXT=ON ^ -DWITH_OPENGLTESTER=ON ^ diff --git a/package/ci/appveyor.yml b/package/ci/appveyor.yml index 85e5a1c52..e37407c20 100644 --- a/package/ci/appveyor.yml +++ b/package/ci/appveyor.yml @@ -48,6 +48,12 @@ install: - IF "%TARGET%" == "desktop" IF "%COMPILER%" == "mingw" IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\SDL2-devel-2.0.4-mingw.tar.gz appveyor DownloadFile http://libsdl.org/release/SDL2-devel-2.0.4-mingw.tar.gz - IF "%TARGET%" == "desktop" IF "%COMPILER%" == "mingw" 7z x SDL2-devel-2.0.4-mingw.tar.gz & 7z x SDL2-devel-2.0.4-mingw.tar & ren SDL2-2.0.4 SDL +# GLFW +- IF "%TARGET%" == "desktop" IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\glfw-3.2.1.bin.WIN64.zip appveyor DownloadFile https://github.com/glfw/glfw/releases/download/3.2.1/glfw-3.2.1.bin.WIN64.zip +- IF "%TARGET%" == "desktop" 7z x glfw-3.2.1.bin.WIN64.zip && ren glfw-3.2.1.bin.WIN64 glfw && mkdir deps && mkdir deps\lib && mkdir deps\bin && mkdir deps\include && xcopy /e glfw\include\* deps\include\ +- IF "%TARGET%" == "desktop" IF "%COMPILER%" == "msvc" copy glfw\lib-vc2015\glfw3.dll deps\bin\ && copy glfw\lib-vc2015\glfw3dll.lib deps\lib\glfw3.lib +- IF "%TARGET%" == "desktop" IF "%COMPILER%" == "mingw" copy glfw\lib-mingw-w64\glfw3.dll deps\bin\ && copy glfw\lib-mingw-w64\libglfw3dll.a deps\lib\libglfw3.a + build_script: - IF "%TARGET%" == "desktop" IF "%COMPILER%" == "msvc" call package\ci\appveyor-desktop.bat - IF "%TARGET%" == "desktop" IF "%COMPILER%" == "mingw" call package\ci\appveyor-desktop-mingw.bat @@ -59,3 +65,4 @@ cache: - SDL2-devel-2.0.4-mingw.zip - openal-soft-1.17.2-bin.zip - x86_64-6.3.0-release-posix-seh-rt_v5-rev1.7z +- glfw-3.2.1.bin.WIN64.zip