1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 16:49:55 +00:00
Commit graph

355 commits

Author SHA1 Message Date
David Cernat
80af0ce6a7 Add OpenMW commits up to 29 Aug 2020
# Conflicts:
#   CMakeLists.txt
#   apps/openmw/mwmechanics/character.cpp
2020-08-29 16:15:22 +02:00
AnyOldName3
70384d8a83 Restore previous bash settings on exit 2020-08-27 03:03:03 +01:00
AnyOldName3
b71f13965a Don't set pipefail 2020-08-27 02:30:40 +01:00
David Cernat
baa9446cd1 Add OpenMW commits up to 4 Aug 2020 2020-08-04 17:41:01 +02:00
descawed
58e0b34adc Verify certificates when downloading dependencies 2020-08-03 22:59:08 +00:00
David Cernat
ff10aa816b Add OpenMW commits up to 25 Jul 2020
# Conflicts:
#   .travis.yml
2020-07-25 19:44:01 +02:00
Nikolay Kasyanov
3be1cdef33
[macOS, CI] Use Xcode 11.6 (#2970)
* [macOS, CI] Use Xcode 11.6

* [macOS, CI] Enable OpenCs build and see how it goes

* [macOS, CI] Re-enable package build and check
2020-07-22 21:54:18 +02:00
David Cernat
39e429c9eb Add OpenMW commits up to 11 Jul 2020
# Conflicts:
#   .travis.yml
#   apps/openmw/mwmechanics/actors.cpp
2020-07-11 21:42:01 +02:00
AnyOldName3
38f1eae575 Merge remote-tracking branch 'upstream/master' into yet-another-windows-shared-runner-attempt 2020-07-11 01:19:36 +01:00
Bret Curtis
4a17bf27a3 Set BULLET_ROOT via add_cmake_opts like we do the rest 2020-07-11 00:18:14 +02:00
Bret Curtis
14d5b3eeaf try release again and turning on bit by bit for ccache to be used 2020-07-06 07:47:31 +02:00
David Cernat
e85f506569 [CI] Assign execution permission to before_script_linux.sh 2020-07-04 17:25:04 +03:00
David Cernat
5eb7eb8d88 Add OpenMW commits up to 4 Jul 2020
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
#	apps/openmw/engine.cpp
#	apps/openmw/mwbase/windowmanager.hpp
#	apps/openmw/mwgui/charactercreation.cpp
#	apps/openmw/mwgui/windowmanagerimp.hpp
#	apps/openmw/mwmechanics/character.cpp
2020-07-04 16:50:54 +03:00
Bret Curtis
db75398fba only build openmw for now 2020-07-04 11:54:19 +02:00
Bret Curtis
3ea576efdc do not build a few things; temporary disable checking package; get things compiling and cached first 2020-07-03 23:24:54 +02:00
Bret Curtis
1e23d007dd Use Debug instead of Release to increase build time (passing -O0) 2020-07-01 22:23:02 +02:00
Bret Curtis
a62e3a7b35 What happens when I remove the sysroot line? 2020-07-01 18:50:41 +02:00
Bret Curtis
3eeee4bc94 drop need to upgrade qt, 5.15 is by default installed; add CXX_FLAGS; retarget SYSROOT to 10.15 2020-07-01 17:52:34 +02:00
AnyOldName3
0d7b9c51fd Log misparsed stuff as it caused an unexpected CI failure 2020-06-28 03:51:41 +01:00
Evil Eye
fcc761c13c Update Windows CI script to download a version of Google Test that can actually compile the tests 2020-06-27 15:30:28 +02:00
AnyOldName3
35d920569c Tweak error message
As we have `set -e`, the error message would never be printed if we
genuinely failed to create the virtualenv, just if we succeeded and the
expected directories didn't exist.
2020-06-23 15:26:24 +01:00
AnyOldName3
657306c293 Make Qt work on my machine
Switches `eval stuff $STRIP` to `run_cmd` as it'll log errors on failure
and eval was breaking commands that ran just fine otherwise.

Don't download aqt wheel from pip and install it in two separate steps.

Upgrade aqt from 0.8 to 0.9.2 as there are bugs with 0.8 that stop Qt
5.15.0 from working for some people.

Fall back to Qt 5.14.2 for 64-bit on MSVC 2017 as the package list is
broken and that specific combination doesn't work right now.
2020-06-23 15:22:59 +01:00
Bret Curtis
ae49549f03
change build type to debug for ci/cd
it should set -O0 which should prioritise fast compilation for gcc
2020-06-23 12:19:38 +02:00
Bret Curtis
ad25b22db7 removed need for split compilation for static analysis, we've gone from openmw taking 30 minutes to taking 3. Merging them also makes our before_script.linux.sh less complicated; removed redundant CMAKE flag; set build type to RelWithDebInfo as None has no meaning (even if it still builds). 2020-06-23 07:59:05 +02:00
David Cernat
b42c1498f9 [CI] Temporarily disable building of CS 2020-06-22 23:49:36 +03:00
David Cernat
3b2eb6f62c Add OpenMW commits up to 22 Jun 2020
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
2020-06-22 20:50:55 +03:00
Bret Curtis
61a5c6125d #5480: Drop Qt4 support and require Qt 5.12 or later. 2020-06-22 12:17:06 +02:00
AnyOldName3
36d0a55600 Add error message when vswhere doesn't find MSVC 2020-06-18 14:50:07 +01:00
AnyOldName3
a93ea93d9d Remove MSVC 2015 specific parts of CI script.
Also add error when MSVC 2015 is requested.
2020-06-18 14:46:08 +01:00
AnyOldName3
7ef3a9d8ac Remove schoolboy error 2020-06-16 13:51:25 +00:00
psi29a
9067894335 Merge branch 'set-e-kills-ret' into 'master'
Fix Windows prebuild script error messages

Closes #5459

See merge request OpenMW/openmw!223
2020-06-16 08:37:16 +00:00
AnyOldName3
079be5d485 Remove annoying warning 2020-06-15 16:37:47 +01:00
AnyOldName3
761558f612 Remove test data
A dummy command was used to check the script would fail if a command was missing.
Not being a real command, it always made the script fail as a command was missing.
2020-06-15 16:36:30 +01:00
AnyOldName3
5bffa7453f Merge branch 'fix-msvc-buildtools' into 'master'
Fix the build script not detecting Visual Studio Build Tools installation

See merge request OpenMW/openmw!224
2020-06-15 14:23:52 +00:00
apommel
4b831f99da Allow vswhere to detect build tools installations 2020-06-15 10:13:22 +09:00
Alexei Dobrohotov
09537ed312 Merge branch 'master' into 'AnyOldName3-master-patch-15901'
# Conflicts:
#   CI/before_script.msvc.sh
2020-06-14 19:47:01 +00:00
AnyOldName3
a6493ce329 Don't exit prebuild script on nonzero exit code when we already check it
We have `set -e` enabled, so normally exit the script if a command fails.
We also had explicit exit code checks in a few places with user-friendly
error messages. These were never printed as the script exited before we
could check the exit code due to a bad exit code.
2020-06-13 01:51:27 +01:00
AnyOldName3
0d2129ca13 Add success message to Windows prebuild script 2020-06-12 22:50:06 +00:00
AnyOldName3
13c4e4b2a9 Fix ifs for ACTIVATE_MSVC 2020-06-12 22:35:38 +00:00
David Cernat
e5b1843089 Add OpenMW commits up to 11 Jun 2020
# Conflicts:
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/activespells.cpp
#	apps/openmw/mwmechanics/aiactivate.cpp
#	apps/openmw/mwmechanics/aiactivate.hpp
#	apps/openmw/mwmechanics/creaturestats.cpp
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/statsextensions.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
2020-06-11 13:21:58 +03:00
David Cernat
36a2308acd Add OpenMW commits up to 30 May 2020
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwbase/windowmanager.hpp
#	apps/openmw/mwgui/windowmanagerimp.hpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwscript/interpretercontext.cpp
2020-06-09 17:50:26 +03:00
AnyOldName3
be22e80d33 Merge branch 'always-say-what-to-do' into 'master'
Print MSVC activation info in verbose mode, too.

See merge request OpenMW/openmw!212
2020-06-08 21:42:28 +00:00
David Cernat
62df188fd4 Add OpenMW commits up to 16 May 2020
# Conflicts:
#	CI/before_script.linux.sh
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwscript/globalscripts.cpp
#	apps/openmw/mwscript/interpretercontext.cpp
#	apps/openmw/mwworld/cellstore.cpp
#	apps/openmw/mwworld/cellstore.hpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
#	components/interpreter/context.hpp
2020-06-06 22:38:28 +03:00
AnyOldName3
6e267e398e Fix copy-paste snafu 2020-06-03 22:38:08 +00:00
AnyOldName3
86c1d0f4be Warn about fake stub Python 2020-06-03 22:36:55 +00:00
AnyOldName3
08e5d93c9b Print MSVC activation info in verbose mode, too. 2020-05-18 17:36:07 +01:00
elsid
2e09e96f5d
Fix msvc dir for Qt
Otherwise it fails with:
Qt 5.15.0... Exists. CI/before_script.msvc.sh: line 781: cd: MSVC2019_64_Ninja/deps/Qt/5.15.0/msvc2015_64: No such file or directory
2020-05-17 15:21:12 +02:00
Bret Curtis
9fd8470741
Merge branch 'master' into cherry-pick-e0b35232 2020-05-17 02:23:18 +02:00
Alexander "Ananace" Olofsson
7b781d8890
Windows CI dependency upgrade (#2847)
* Windows CI: Use OSG 3.4-experimental for 0.46

* Update compiled Windows CI dependencies

Only built and pushed so far, still need to try making full OpenMW
builds with them as well.

* Update missed Bullet version number

* MyGUI uses RelWithDebInfo for Release builds now

* Update Windows CI dependencies, switch Qt install

* Fix aqt retrieval and setup

* Make aqt install output slightly nicer

* Bump to Qt 5.15 for VS2019 support

* Fix FFmpeg and Qt install parts

* Fix OSG plugin DLL copying

* Add CMake flag for double-precision bullet

* Roll back 2019 to Boost 1.71 for CI

* Move aqt into unpack step, to allow manual install
2020-05-17 01:12:04 +02:00
psi29a
38daa83ff6 Merge branch 'ninja' into 'master'
Enable Windows Ninja builds

See merge request OpenMW/openmw!202

(cherry picked from commit e0b352323226ff11e230f6489e826df332fa681a)

c1e673ce Unify path conversion functions
fdf0fdbb Fix NMake with MSVC 2019
bdd4a814 Activate MSVC during CMake setup for NMake
eae41050 Support sourcing
c0d28a0e Warn that MSVC environment will need to be activated
bd16ad62 Ninja
7d57e6e2 Support MSVC 2015
3679d329 Check MSVC activated correctly
ed4b73b8 Fix post-2015 Visual Studio
4ffa116a Print message when it's necessary instead of when it isn't
c6e09461 Add instructions for using VS' non-.sln support
d9bb6e63 Activate MSVC later
9ca26358 Create batch script to activate correct MSVC
61df647d Provide scripts to activate selected MSVC in existing shell without kerfuffle
2020-05-16 22:23:37 +00:00