From d732178e1f7cd450447acc37f60502f5d37dcd64 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 20 Nov 2016 07:01:20 -0500 Subject: [PATCH 1/1] CI: Update inactive CI configurations to match current state --- .appveyor.yml | 6 ++++-- .doozer.json | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 65dd1fc..8e693ad 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -10,15 +10,17 @@ image: Visual Studio 2015 # enforce the location, since we want predictable cmake things clone_folder: c:\projects\osslugaru\lugaru -# Build for 32-bit target only +# Build for 32-bit and 64-bit platform: - Win32 + - Win64 # Prep work (CMake VS project generation) before_build: - cd c:\projects\osslugaru\lugaru - set PATH=C:\Program Files (x86)\MSBuild\14.0\BIN;%PATH% - - if %PLATFORM% == Win32 cmake . -DCMAKE_BUILD_TYPE=Debug -DLUGARU_INSTALL_PREFIX=C:\projects\osslugaru\lugaru\msvc32-build -DLUGARU_FORCE_INTERNAL_GLU=True -DLUGARU_FORCE_INTERNAL_JPEG=True -DLUGARU_FORCE_INTERNAL_PNG=True -DLUGARU_FORCE_INTERNAL_VORBIS=True -DLUGARU_FORCE_INTERNAL_ZLIB=True -DLUGARU_FORCE_INTERNAL_OPENAL=True + - if %PLATFORM% == Win32 cmake . -DCMAKE_BUILD_TYPE=Debug -DLUGARU_INSTALL_PREFIX=C:\projects\osslugaru\lugaru\msvc32-build + - if %PLATFORM% == Win64 cmake . -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=Debug -DLUGARU_INSTALL_PREFIX=C:\projects\osslugaru\lugaru\msvc64-build # Tell it what to build build: diff --git a/.doozer.json b/.doozer.json index 90b0b88..8f1baee 100644 --- a/.doozer.json +++ b/.doozer.json @@ -2,7 +2,7 @@ "targets": { "centos7-x86_64": { "buildenv": "centos7-x86_64", - "builddeps": ["/usr/bin/cmake3", "pkgconfig(libjpeg)", "pkgconfig(openal)", "pkgconfig(sdl)", "pkgconfig(glu)", "pkgconfig(libpng)", "pkgconfig(zlib)", "pkgconfig(vorbis)", "pkgconfig(vorbisfile)", "pkgconfig(ogg)", "make"], + "builddeps": ["/usr/bin/cmake3", "pkgconfig(libjpeg)", "pkgconfig(openal)", "pkgconfig(sdl2)", "pkgconfig(glu)", "pkgconfig(libpng)", "pkgconfig(zlib)", "pkgconfig(vorbis)", "pkgconfig(vorbisfile)", "pkgconfig(ogg)", "make"], "buildcmd": ["cmake3 . -DLUGARU_INSTALL_PREFIX=/opt/osslugaru/lugaru/gcc-build", "make -j4"] }, "macosx": { -- 2.39.5