[Scummvm-git-logs] scummvm master -> 94da12c4bf8b3207051b54817ecc317b604226d8
sev-
sev at scummvm.org
Sun Oct 4 16:31:05 UTC 2020
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
659390ad22 CI: Add iOS builds to GitHub Actions
f0097abc53 CI: Add macOS builds to GitHub Actions
1355bfee75 CREATE_PROJECT: Add missing libraries to the Xcode generator
94da12c4bf TRAVIS: Remove OS X builds
Commit: 659390ad228cbf07d34105fdbec674b0199d56f9
https://github.com/scummvm/scummvm/commit/659390ad228cbf07d34105fdbec674b0199d56f9
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-10-04T18:31:00+02:00
Commit Message:
CI: Add iOS builds to GitHub Actions
Changed paths:
.github/workflows/ci.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4414f94817..ae81f4957f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -93,3 +93,45 @@ jobs:
# with:
# name: symbols-${{ matrix.arch }}
# path: ${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_ROOT_OUT }}\\installed\\${{ matrix.triplet }}\\bin\\*.pdb
+ xcode:
+ name: Xcode
+ runs-on: macOS-latest
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ - platform: ios7
+ buildFlags: -scheme ScummVM-iOS CODE_SIGN_IDENTITY="" CODE_SIGNING_ALLOWED=NO
+ configFlags: --disable-nasm --disable-opengl --disable-theora --disable-taskbar --disable-tts --disable-fribidi
+ packagesUrl: https://www.scummvm.org/frs/build/scummvm-ios7-libs-v2.zip
+ steps:
+ - name: Checkout
+ uses: actions/checkout at v2
+ - name: Install packages
+ run: |
+ mkdir build-scummvm
+ cd build-scummvm
+ curl -L -o libs.zip ${{ matrix.packagesUrl }}
+ unzip libs.zip
+ ls
+ cd ..
+ - name: Select Xcode
+ run: sudo xcode-select -switch /Applications/Xcode_10.3.app && /usr/bin/xcodebuild -version
+ - name: Build create_project
+ run: |
+ cd devtools/create_project/xcode
+ xcodebuild
+ ls
+ cd ../../../
+ - name: Call create_project
+ run: |
+ cd build-scummvm
+ ../devtools/create_project/xcode/build/Release/create_project $PWD/.. --xcode --enable-all-engines ${{ matrix.configflags }}
+ ls
+ cd ..
+ - name: Build scummvm
+ run: |
+ cd build-scummvm
+ ls
+ xcodebuild build -project scummvm.xcodeproj ${{ matrix.buildFlags }}
+ cd ..
Commit: f0097abc53cf5a37cd7196039bd693dc9f5d894a
https://github.com/scummvm/scummvm/commit/f0097abc53cf5a37cd7196039bd693dc9f5d894a
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-10-04T18:31:00+02:00
Commit Message:
CI: Add macOS builds to GitHub Actions
Changed paths:
.github/workflows/ci.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ae81f4957f..97e0a80e04 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -100,6 +100,10 @@ jobs:
fail-fast: false
matrix:
include:
+ - platform: macosx
+ buildFlags: -scheme ScummVM-macOS
+ configFlags: --disable-nasm --enable-faad --enable-mpeg2
+ brewPackages: a52dec faad2 flac fluid-synth freetype fribidi mad libmpeg2 libogg libpng libvorbis sdl2 sdl2_net theora
- platform: ios7
buildFlags: -scheme ScummVM-iOS CODE_SIGN_IDENTITY="" CODE_SIGNING_ALLOWED=NO
configFlags: --disable-nasm --disable-opengl --disable-theora --disable-taskbar --disable-tts --disable-fribidi
@@ -108,13 +112,14 @@ jobs:
- name: Checkout
uses: actions/checkout at v2
- name: Install packages
+ if: ${{ matrix.brewPackages }}
+ run: brew install ${{ matrix.brewPackages }}
+ - name: Download libraries
+ if: ${{ matrix.packagesUrl }}
run: |
- mkdir build-scummvm
- cd build-scummvm
curl -L -o libs.zip ${{ matrix.packagesUrl }}
unzip libs.zip
ls
- cd ..
- name: Select Xcode
run: sudo xcode-select -switch /Applications/Xcode_10.3.app && /usr/bin/xcodebuild -version
- name: Build create_project
@@ -125,13 +130,9 @@ jobs:
cd ../../../
- name: Call create_project
run: |
- cd build-scummvm
- ../devtools/create_project/xcode/build/Release/create_project $PWD/.. --xcode --enable-all-engines ${{ matrix.configflags }}
+ ./devtools/create_project/xcode/build/Release/create_project . --xcode --enable-all-engines ${{ matrix.configflags }}
ls
- cd ..
- name: Build scummvm
run: |
- cd build-scummvm
- ls
xcodebuild build -project scummvm.xcodeproj ${{ matrix.buildFlags }}
- cd ..
+ ls
Commit: 1355bfee7589d85e7c9dd81dfe6544c150399284
https://github.com/scummvm/scummvm/commit/1355bfee7589d85e7c9dd81dfe6544c150399284
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-10-04T18:31:00+02:00
Commit Message:
CREATE_PROJECT: Add missing libraries to the Xcode generator
Changed paths:
devtools/create_project/xcode.cpp
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 1d1c1bb443..6bde9b8890 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -454,6 +454,9 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
DEF_SYSTBD("libiconv");
// Local libraries
+ if (CONTAINS_DEFINE(setup.defines, "USE_FAAD")) {
+ DEF_LOCALLIB_STATIC("libfaad");
+ }
if (CONTAINS_DEFINE(setup.defines, "USE_FLAC")) {
DEF_LOCALLIB_STATIC("libFLAC");
}
@@ -475,6 +478,9 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
if (CONTAINS_DEFINE(setup.defines, "USE_MAD")) {
DEF_LOCALLIB_STATIC("libmad");
}
+ if (CONTAINS_DEFINE(setup.defines, "USE_MPEG2")) {
+ DEF_LOCALLIB_STATIC("libmpeg2");
+ }
if (CONTAINS_DEFINE(setup.defines, "USE_FRIBIDI")) {
DEF_LOCALLIB_STATIC("libfribidi");
}
@@ -547,6 +553,9 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
frameworks_iOS.push_back("QuartzCore.framework");
frameworks_iOS.push_back("OpenGLES.framework");
+ if (CONTAINS_DEFINE(setup.defines, "USE_FAAD")) {
+ frameworks_iOS.push_back("libfaad.a");
+ }
if (CONTAINS_DEFINE(setup.defines, "USE_FLAC")) {
frameworks_iOS.push_back("libFLAC.a");
}
@@ -575,6 +584,9 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
if (CONTAINS_DEFINE(setup.defines, "USE_MAD")) {
frameworks_iOS.push_back("libmad.a");
}
+ if (CONTAINS_DEFINE(setup.defines, "USE_MPEG2")) {
+ frameworks_iOS.push_back("libmpeg2.a");
+ }
if (CONTAINS_DEFINE(setup.defines, "USE_FRIBIDI")) {
frameworks_iOS.push_back("libfribidi.a");
}
@@ -637,6 +649,9 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
frameworks_osx.push_back("Cocoa.framework");
frameworks_osx.push_back("AudioUnit.framework");
+ if (CONTAINS_DEFINE(setup.defines, "USE_FAAD")) {
+ frameworks_osx.push_back("libfaad.a");
+ }
if (CONTAINS_DEFINE(setup.defines, "USE_FLAC")) {
frameworks_osx.push_back("libFLAC.a");
}
@@ -657,6 +672,9 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
if (CONTAINS_DEFINE(setup.defines, "USE_MAD")) {
frameworks_osx.push_back("libmad.a");
}
+ if (CONTAINS_DEFINE(setup.defines, "USE_MPEG2")) {
+ frameworks_osx.push_back("libmpeg2.a");
+ }
if (CONTAINS_DEFINE(setup.defines, "USE_FRIBIDI")) {
frameworks_osx.push_back("libfribidi.a");
}
@@ -679,6 +697,9 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
if (CONTAINS_DEFINE(setup.defines, "USE_ZLIB")) {
frameworks_osx.push_back("libz.tbd");
}
+ if (CONTAINS_DEFINE(setup.defines, "USE_DISCORD")) {
+ frameworks_osx.push_back("libdiscord-rpc.a");
+ }
if (setup.useSDL2) {
frameworks_osx.push_back("libSDL2main.a");
Commit: 94da12c4bf8b3207051b54817ecc317b604226d8
https://github.com/scummvm/scummvm/commit/94da12c4bf8b3207051b54817ecc317b604226d8
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-10-04T18:31:00+02:00
Commit Message:
TRAVIS: Remove OS X builds
Changed paths:
.travis.yml
diff --git a/.travis.yml b/.travis.yml
index afa01cb818..ae85eb741d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,29 +31,6 @@ addons:
- libieee1284-3-dev
- libsndio-dev
- libreadline-dev
- homebrew:
- packages:
- - ccache
- - a52dec
- - curl-openssl
- - faad2
- - flac
- - fluid-synth
- - freetype
- - fribidi
- - jpeg-turbo
- - mad
- - libmpeg2
- - libogg
- - libpng
- - libvorbis
- - pandoc
- - pkg-config
- - sdl2
- - sdl2_net
- - theora
- - zlib
- update: true
branches:
only:
@@ -72,14 +49,6 @@ matrix:
before_script:
- sudo ln -s $(which ccache) /usr/lib/ccache/clang
- sudo ln -s $(which ccache) /usr/lib/ccache/clang++
- - os: osx
- compiler: clang
- cache:
- directories:
- - $HOME/Library/Caches/Homebrew
- ccache: true
- before_cache:
- - brew cleanup
dist: xenial
More information about the Scummvm-git-logs
mailing list