mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-04 05:45:35 +00:00
Code Issues Releases Wiki Activity

Fix a few merge issues

Browse source
This commit is contained in:
Alexander "Ace" Olofsson 2015-07-06 10:59:40 +02:00
parent c6fa86d859
commit 8c6ba01c08
1 changed files with 5 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
CI/before_script.msvc.sh
View file

@ -222,9 +222,11 @@ if [ -z $SKIP_DOWNLOAD ]; then
OSG-3.3.8-win$BITS.7z OSG-3.3.8-win$BITS.7z
# Qt # Qt
if [ -z $APPVEYOR ]; then
download "Qt 4.8.6" \ download "Qt 4.8.6" \
http://sourceforge.net/projects/qt64ng/files/qt/$ARCHNAME/4.8.6/msvc2013/qt-4.8.6-x$ARCHSUFFIX-msvc2013.7z \ http://sourceforge.net/projects/qt64ng/files/qt/$ARCHNAME/4.8.6/msvc2013/qt-4.8.6-x$ARCHSUFFIX-msvc2013.7z \
qt$BITS-4.8.6.7z qt$BITS-4.8.6.7z
fi
# SDL2 # SDL2
download "SDL 2.0.3" \ download "SDL 2.0.3" \
@ -557,44 +559,6 @@ else
esac esac
fi fi
if [ -z $APPVEYOR ]; then
echo " (Outside of AppVeyor, doing full build.)"
else
case $STEP in
components )
echo " Subproject: Components."
add_cmake_opts -DBUILD_ESSIMPORTER=no \
-DBUILD_LAUNCHER=no \
-DBUILD_MWINIIMPORTER=no \
-DBUILD_OPENCS=no \
-DBUILD_OPENMW=no \
-DBUILD_WIZARD=no
rm -rf components
;;
openmw )
echo " Subproject: OpenMW."
add_cmake_opts -DBUILD_ESSIMPORTER=no \
-DBUILD_LAUNCHER=no \
-DBUILD_MWINIIMPORTER=no \
-DBUILD_OPENCS=no \
-DBUILD_WIZARD=no
;;
opencs )
echo " Subproject: OpenCS."
add_cmake_opts -DBUILD_ESSIMPORTER=no \
-DBUILD_LAUNCHER=no \
-DBUILD_MWINIIMPORTER=no \
-DBUILD_OPENMW=no \
-DBUILD_WIZARD=no
;;
misc )
echo " Subproject: Misc."
add_cmake_opts -DBUILD_OPENCS=no \
-DBUILD_OPENMW=no
;;
esac
fi
if [ -z $VERBOSE ]; then if [ -z $VERBOSE ]; then
printf " Configuring... " printf " Configuring... "
else else