mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 18:19:55 +00:00
Code Issues Releases Wiki Activity

Bring over some more OSG changes to the Appveyor scripts, and properly use Qt

Browse source
This commit is contained in:
Alexander "Ace" Olofsson 2015-06-25 19:19:04 +02:00
parent b93cba9a69
commit 331d87d738
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
CI/before_script.msvc.sh
View file

@ -52,8 +52,9 @@ run_cmd() {
if [ -z $APPVEYOR ]; then if [ -z $APPVEYOR ]; then
echo "Command $CMD failed, output can be found in `real_pwd`/output.log" echo "Command $CMD failed, output can be found in `real_pwd`/output.log"
else else
appveyor AddMessage "Command $CMD failed." -Category Error -Details "$CMD $@" echo
while read in; do appveyor AddMessage "$in" -Category Error; done < output.log echo "Command $CMD failed;"
cat output.log
fi fi
else else
rm output.log rm output.log
@ -451,7 +452,8 @@ if [ -z $APPVEYOR ]; then
cd $QT_SDK cd $QT_SDK
eval qtbinpatcher.exe $STRIP eval qtbinpatcher.exe $STRIP
add_cmake_opts -DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe" add_cmake_opts -DDESIRED_QT_VERSION=4 \
-DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe"
if [ $CONFIGURATION == "Debug" ]; then if [ $CONFIGURATION == "Debug" ]; then
SUFFIX="d4" SUFFIX="d4"
@ -471,7 +473,7 @@ else
QT_SDK="C:/Qt/5.4/msvc2013_64_opengl" QT_SDK="C:/Qt/5.4/msvc2013_64_opengl"
fi fi
add_cmake_opts -DDESIRED_QT_VERSION=4 \ add_cmake_opts -DDESIRED_QT_VERSION=5 \
-DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe" -DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe"
fi fi
@ -505,8 +507,7 @@ echo "Setting up OpenMW build..."
add_cmake_opts -DBUILD_BSATOOL=no \ add_cmake_opts -DBUILD_BSATOOL=no \
-DBUILD_ESMTOOL=no \ -DBUILD_ESMTOOL=no \
-DBUILD_MYGUI_PLUGIN=no \ -DBUILD_MYGUI_PLUGIN=no
-DOPENMW_MP_BUILD=yes
if [ -z $APPVEYOR ]; then if [ -z $APPVEYOR ]; then
echo " (Outside of AppVeyor, doing full build.)" echo " (Outside of AppVeyor, doing full build.)"

27
appveyor.yml
View file

@ -6,28 +6,25 @@ platform:
configuration: configuration:
- Debug - Debug
- Release
environment:
matrix:
- STEP: openmw
- STEP: opencs
- STEP: misc
matrix: matrix:
fast_finish: true fast_finish: true
os: unstable os: unstable
clone_depth: 5 clone_depth: 1
cache: cache:
- C:\projects\openmw\deps\Bullet-2.83.4-win32.7z -> CI/before_script.msvc.sh - C:\projects\openmw\deps\ffmpeg32-2.5.2.7z
- C:\projects\openmw\deps\Bullet-2.83.4-win64.7z -> CI/before_script.msvc.sh - C:\projects\openmw\deps\ffmpeg32-2.5.2-dev.7z
- C:\projects\openmw\deps\MyGUI-3.2.2-win32.7z -> CI/before_script.msvc.sh - C:\projects\openmw\deps\ffmpeg64-2.5.2.7z
- C:\projects\openmw\deps\MyGUI-3.2.2-win64.7z -> CI/before_script.msvc.sh - C:\projects\openmw\deps\ffmpeg64-2.5.2-dev.7z
- C:\projects\openmw\deps\Ogre-1.9-win32.7z -> CI/before_script.msvc.sh
- C:\projects\openmw\deps\Ogre-1.9-win64.7z -> CI/before_script.msvc.sh
- C:\projects\openmw\deps\ffmpeg32-2.5.2.7z -> CI/before_script.msvc.sh
- C:\projects\openmw\deps\ffmpeg64-2.5.2-dev.7z -> CI/before_script.msvc.sh
- C:\projects\openmw\deps\ffmpeg64-2.5.2.7z -> CI/before_script.msvc.sh
- C:\projects\openmw\deps\ffmpeg64-2.5.2-dev.7z -> CI/before_script.msvc.sh
- C:\projects\openmw\deps\OpenAL-Soft-1.16.0.zip -> CI/before_script.msvc.sh
- C:\projects\openmw\deps\SDL2-2.0.3.zip -> CI/before_script.msvc.sh
init: init:
- cmd: bash --version - cmd: bash --version
@ -42,3 +39,5 @@ build_script:
before_build: before_build:
- cmd: bash --login C:\projects\openmw\CI\before_script.msvc.sh - cmd: bash --login C:\projects\openmw\CI\before_script.msvc.sh
test: off