games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Merge branch 'develop' of https://github.com/vcmi/vcmi into develop

Browse Source
This commit is contained in:
DJWarmonger
2018-01-02 17:36:51 +01:00
parent b778623734 6c2d082676
commit 1a1de5366a
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.travis.yml
View File

@@ -64,11 +64,11 @@ before_script:
source $TRAVIS_BUILD_DIR/CI/get_package_name.sh; source $TRAVIS_BUILD_DIR/CI/get_package_name.sh;
if [[ $VCMI_PLATFORM == 'mxe' ]]; if [[ $VCMI_PLATFORM == 'mxe' ]];
then then
/usr/lib/mxe/usr/bin/i686-w64-mingw32.shared-cmake -G "Unix Makefiles" .. $VCMI_CMAKE_FLAGS /usr/lib/mxe/usr/bin/i686-w64-mingw32.shared-cmake -G Ninja .. $VCMI_CMAKE_FLAGS
-DPACKAGE_NAME_SUFFIX:STRING="$VCMI_PACKAGE_NAME_SUFFIX" -DPACKAGE_NAME_SUFFIX:STRING="$VCMI_PACKAGE_NAME_SUFFIX"
-DPACKAGE_FILE_NAME:STRING="$VCMI_PACKAGE_FILE_NAME"; -DPACKAGE_FILE_NAME:STRING="$VCMI_PACKAGE_FILE_NAME";
else else
cmake -G "Unix Makefiles" .. $VCMI_CMAKE_FLAGS cmake -G Ninja .. $VCMI_CMAKE_FLAGS
-DPACKAGE_NAME_SUFFIX:STRING="$VCMI_PACKAGE_NAME_SUFFIX" -DPACKAGE_NAME_SUFFIX:STRING="$VCMI_PACKAGE_NAME_SUFFIX"
-DPACKAGE_FILE_NAME:STRING="$VCMI_PACKAGE_FILE_NAME"; -DPACKAGE_FILE_NAME:STRING="$VCMI_PACKAGE_FILE_NAME";
fi fi
@@ -77,14 +77,7 @@ before_script:
script: script:
- test $TRAVIS_BRANCH != coverity_scan || exit 0 - test $TRAVIS_BRANCH != coverity_scan || exit 0
- if [[ $TRAVIS_OS_NAME == 'osx' ]]; - ninja
then
cd ..;
xcodebuild -project osx/osx-vcmibuilder/vcmibuilder.xcodeproj/
-configuration Release CONFIGURATION_BUILD_DIR=..;
cd build;
fi
- make -j2
after_success: after_success:
- test $TRAVIS_BRANCH != coverity_scan || exit 0 - test $TRAVIS_BRANCH != coverity_scan || exit 0

2
CI/mac/before_install.sh
View File

@@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
brew update brew update
brew install smpeg2 libpng freetype sdl2 sdl2_ttf sdl2_image qt5 ffmpeg brew install smpeg2 libpng freetype sdl2 sdl2_ttf sdl2_image qt5 ffmpeg ninja
brew install sdl2_mixer --with-smpeg2 brew install sdl2_mixer --with-smpeg2
export CMAKE_PREFIX_PATH="/usr/local/opt/qt5:$CMAKE_PREFIX_PATH" export CMAKE_PREFIX_PATH="/usr/local/opt/qt5:$CMAKE_PREFIX_PATH"

2
CI/mxe/before_install.sh
View File

@@ -23,7 +23,7 @@ mxe-$MXE_TARGET-qt \
mxe-$MXE_TARGET-qtbase mxe-$MXE_TARGET-qtbase
# Install nsis for installer creation # Install nsis for installer creation
sudo apt-get install -qq nsis sudo apt-get install -qq nsis ninja-build
# alias for CMake # alias for CMake
sudo mv /usr/bin/cmake /usr/bin/cmake.orig sudo mv /usr/bin/cmake /usr/bin/cmake.orig