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
5 years ago
66da72048a
Update bullet for windows up to 2.87
5 years ago
4e0c07de0f
Build install target in CI
5 years ago
99cd99bc3b
Remove unused BUILD_MYGUI_PLUGIN option
5 years ago
053a5a6258
Add OpenMW commits up to 9 May 2020
...
# Conflicts:
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwscript/aiextensions.cpp
5 years ago
ca649003ed
Use googletest 1.10.0
...
To get support for INSTANTIATE_TEST_SUITE_P macro
5 years ago
0d10293f24
everything is implied yes
5 years ago
9698c21b36
build bsa and esm tools
5 years ago
25a632c650
Add OpenMW commits up to 13 Apr 2020
...
# Conflicts:
# CMakeLists.txt
# README.md
# apps/openmw/engine.cpp
# apps/openmw/mwclass/creaturelevlist.cpp
# apps/openmw/mwgui/quickkeysmenu.cpp
5 years ago
7bc3298ed4
Add OpenMW commits up to 1 Apr 2020
...
# Conflicts:
# .travis.yml
# CI/before_install.linux.sh
# apps/openmw/mwphysics/physicssystem.cpp
5 years ago
c8596f782a
[macOS, CI] Use prebuilt dependencies with SDL2 2.0.12
5 years ago
d2acac0ebe
Fix Qt download link for Windows
5 years ago
444d667d22
give sdl2 2.0.12 for windows a try
5 years ago
42640b7811
no need to re-map when using system default
5 years ago
5091e2c371
bump to bionic; gcc-9 and clang-10
5 years ago
dae76b91ee
[CI] Assign execution permission to Linux .sh file again
5 years ago
f0f76516d8
Add OpenMW commits up to 4 Feb 2020
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
5 years ago
c690f2d43d
Disable coverage for travis CI
5 years ago
a58f09fd6c
Add OpenMW commits up to 2 Jan 2020
...
# Conflicts:
# apps/openmw/mwmechanics/enchanting.cpp
# apps/openmw/mwworld/scene.cpp
5 years ago
ed31b8c467
Attempt to fix MacOS CI
5 years ago
9d6f3fdd09
Add OpenMW commits up to 1 Dec 2019
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwscript/aiextensions.cpp
# apps/openmw/mwscript/statsextensions.cpp
5 years ago
05a8702b6e
Fix Boost 1.70+ detection
5 years ago
54301f5f89
Add OpenMW commits up to 29 Oct 2019
...
# Conflicts:
# apps/openmw/mwmechanics/combat.cpp
# apps/openmw/mwworld/inventorystore.cpp
5 years ago
5a8bfac4df
hard code Qt to version
5 years ago
e7caf7a037
bump that qt
5 years ago
4c94fcd52b
add msvc2019 and ditch msvc2015
5 years ago
0220bcdef3
Add Visual Studio 2019 support
5 years ago
5181c601c0
Add OpenMW commits up to 2 May 2019
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwscript/statsextensions.cpp
5 years ago
f671c0bddc
Add OpenMW commits up to 1 Apr 2019
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/engine.cpp
# apps/openmw/mwdialogue/dialoguemanagerimp.cpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwgui/trainingwindow.cpp
# apps/openmw/mwgui/travelwindow.cpp
# apps/openmw/mwgui/waitdialog.cpp
5 years ago
de16b8118c
[CI] Fix execution permission for before_script_linux.sh
5 years ago
8729c3c5e3
Add OpenMW commits up to 9 Mar 2019
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
# README.md
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwscript/animationextensions.cpp
# apps/openmw/mwscript/guiextensions.cpp
# apps/openmw/mwscript/miscextensions.cpp
# apps/openmw/mwscript/soundextensions.cpp
5 years ago
95a5607509
Add OpenMW commits up to 22 Feb 2019
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwscript/containerextensions.cpp
5 years ago
6205ff6b04
Add OpenMW commits up to 30 Jan 2019
...
# Conflicts:
# apps/openmw/mwworld/worldimp.cpp
5 years ago
d439edce70
[CI] Fix oversight in before_script_linux.sh
5 years ago
6fdef4fd0a
Add OpenMW commits up to 1 Jan 2019
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwphysics/physicssystem.hpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
68886e7539
Add OpenMW commits up to 2 Dec 2018
...
# Conflicts:
# .travis.yml
# README.md
5 years ago
1b9842c175
[CI] Fix oversights in .travis.yml and before_script_linux.sh
5 years ago
cbba81df03
Add OpenMW commits up to 14 Nov 2018
...
# Conflicts:
# .travis.yml
# CI/before_install.linux.sh
# CI/before_script.linux.sh
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwworld/containerstore.cpp
# apps/openmw/mwworld/inventorystore.cpp
5 years ago
3efffe92e3
Add OpenMW commits up to 5 Nov 2018
...
# Conflicts:
# CI/before_install.linux.sh
# CMakeLists.txt
# apps/openmw/mwmechanics/aifollow.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
# apps/openmw/mwphysics/physicssystem.hpp
# apps/openmw/mwworld/scene.cpp
# apps/openmw/mwworld/worldimp.cpp
# components/CMakeLists.txt
5 years ago
7de1a3d016
[CI] Assign execution permissions to Linux .sh files
5 years ago
7edfca06cf
[CI] Fix issues in before_install.linux.sh
5 years ago
fba07194cf
Add OpenMW commits up to 29 Oct 2018
...
# Conflicts:
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/aicombat.cpp
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
84cab59057
Add OpenMW commits up to 19 Aug 2018
...
# Conflicts:
# .travis.yml
# CI/before_install.linux.sh
# CI/before_script.linux.sh
# apps/openmw/engine.cpp
# apps/openmw/main.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwscript/aiextensions.cpp
# apps/openmw/mwscript/containerextensions.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
# apps/openmw/mwworld/cellstore.cpp
# apps/openmw/mwworld/containerstore.cpp
# apps/openmw/mwworld/scene.cpp
# apps/openmw/mwworld/worldimp.cpp
# components/misc/debugging.hpp
5 years ago
c89876538d
Fix macOS nightly preupload check
...
Previously, it was always ls'ing home directory.
6 years ago
d305e1933a
Get ccache path from Homebrew
...
Also, don't use legacy syntax to get Qt path.
6 years ago
95ae9c4ac8
Don't downgrade CMake
6 years ago
a11c391231
Enable ccache for macOS CI
6 years ago
8c1a73ff11
Merge pull request #2220 from elsid/ccache
...
Use ccache for linux CI build
6 years ago
26dfa287f9
Use ccache for linux CI build
6 years ago
7d2c741d1d
Fix compare with empty value
6 years ago
e99f783c65
Remove white spaces and trailing spaces
6 years ago
f8118272f4
Package FreeType plugin for OSG in Windows
...
Fixes #4872
6 years ago
cb5a57e41b
Merge pull request #1547 from AnyOldName3/osgshadow-test-vdsm
...
Shadows
6 years ago
77386525f2
[General] Update Travis CI
6 years ago
cdbd3a9c09
Fix macOS CI
...
It looks like Homebrew has deprecated some syntax making CMake formula invalid, now a for of the formula is used.
6 years ago
8482236a82
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
6 years ago
6d8215ecb6
Google Test / Google Mock / OpenMW unit tests on Windows
6 years ago
4a266b3277
[macOS, CI] Update dependencies
...
They now include boost iostreams for TES 4/5 BSA support.
See https://gitlab.com/OpenMW/openmw/merge_requests/56 .
6 years ago
9cce6ecfe3
[macOS] Update deploy script to use ssh/scp
6 years ago
956934911a
[macOS, CI] Use CMake 3.12.4
...
See https://gitlab.com/OpenMW/openmw/issues/4767 for details.
6 years ago
8e113a32b2
Merge pull request #2081 from nikolaykasyanov/unneed-macos-files
...
Remove unnecessary Recastnavigation headers & static libs from macOS package
6 years ago
e0161bb2bf
Update macOS dependencies, use Xcode 10.1
6 years ago
f98a454ec1
Add a script to verify macOS package contents
6 years ago
e2515f6db7
Merge branch 'master' into osgshadow-test-vdsm
6 years ago
2a2d9f0006
Fix if statements
6 years ago
14fcb9158f
Add NMake support to the Windows prebuild script.
6 years ago
642002b302
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
6 years ago
fc15fa0a89
we now have gcc-5 _and_ gcc-8, along with QT5 and use system tinyxml
6 years ago
f8f66b83b6
Update OpenAL-soft to 1.19.1
6 years ago
461ba74d6d
Merge pull request #2017 from sthalik/pr/allow-build-under-cygwin-msys2-etc
...
fix build with CI dependencies on all Cygwin derivatives
6 years ago
9ae077c033
use c++11 std::align from <memory> ( #2026 )
...
* use c++11 std::align from <memory>
* for Ubuntu, use gcc5 instead of 4.8
* use travis to set gcc to 5
eval
and sudo
* use eval in .travis.yml
* use gcc-8
* replace precise with trusty llvm toolchain, because we have been using trusty for awhile now
* push things to matrix, so we can support multiple releases if we want
* we should not be allowing for failures, we are ready to start trusting clang and its analyzer
* scan-build was pushed to another package
* use gcc-8 still but wrap in scan-build
* travis.yml cleanup, have output of scripts go to stdout, make search for substring a regex
use double []
fix missing ,
use bash to use regex
black spaces matter
* set human readable names for our various builds, split out our static analysis between openmw and openmw-cs
* test if not set, then set otherwise ignore
* use quotes
* do not eval it, set it in travis env
* no more &&
* what does clang7 have to say?
* use sourceline for now
* use clang-7 instead of clang-7.0
* yes, llvm-toolchain-trusty-7 not llvm-toolchain-trusty-7.0
* for static analysis, openmw is compiled and checked on its own while openmw-cs is build with all the rest. this might change in the future.
and actually do it the other way around
6 years ago
b099981c91
fix CI msvc build outside git bash
...
It was only by accident that git bash worked for CI basing on the
"real_pwd()" expression. Replace the dubious replacement pattern with
"cygpath", which is present on git bash, Cygwin, and msys2 alike. In
particular git bash uses msys2 internally.
I was able to confirm a working build under msys2 with a wrapper for
MSVC invocation via the Ninja generator.
6 years ago
f88d5e808c
Rewrite media decoder to use FFMpeg 3.2+ API (task #4686 )
6 years ago
d0c254bc7e
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
6 years ago
792a0585c0
Add recastnavigation as subdirectory
6 years ago
afd700dab9
Ensure different Boost versions get different names
6 years ago
3785ba6aa0
Merge upstream/master
6 years ago
49d81241db
Merge branch 'master' into pathfinder_detour
6 years ago
f62ca24356
[macOS, CI] Use dependencies with downgraded MyGUI, fixing #4665
6 years ago
3d97e96f55
Add dependency to recastnavigation
6 years ago
0124be5713
Merge upstream/master
6 years ago
e627f49df4
Fix AppVeyor build
6 years ago
2073218fc6
Use specific googletest version
6 years ago
80082308f0
Merge upstream (shadermanager log system revamp)
6 years ago
ef631a0961
Add dependency for GMock
6 years ago
cc23a968d1
Merge upstream/master
7 years ago
65de028e0d
Merge pull request #462 from OpenMW/master
...
Add OpenMW commits up to 23 Jul 2018
7 years ago
84b80ae405
no spaces in assignment
7 years ago
b910106713
Catch an unbound variable before it happens.
7 years ago
6cb5ac6e63
Merge pull request #457 from OpenMW/master while resolving conflicts
...
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/main.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwmechanics/character.cpp
components/CMakeLists.txt
7 years ago
739c49d59b
Merge branch 'master' into 'win10_ci'
...
# Conflicts:
# CI/before_script.msvc.sh
7 years ago
a236ffc4be
Merge pull request #456 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# README.md
# apps/openmw/mwgui/quickkeysmenu.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/combat.cpp
7 years ago
57e2573593
Update before_script.msvc.sh
...
check if temp directory exists, error out and warn user about it.
7 years ago
70e9d5c0a0
; it?
7 years ago
11030e56c4
detect existing dir
7 years ago
4f07ca28a6
Try passing the _real_ windows dir to innoinstaller, then using the linux-like directory for mv.
7 years ago
d4c9586bd0
try just converting the \ to a /
7 years ago
af75c1e909
Update before_script.msvc.sh
...
reverting back to what works
7 years ago
4d60fe5a76
reverting back
7 years ago
b8b07b52f0
try this...
7 years ago
4177fd04eb
Update before_script.msvc.sh
...
Does it blend?
7 years ago
209359bbc3
Try this on for size...
7 years ago
78a3f95ee4
Update before_script.msvc.sh
7 years ago
2bf0d598cf
Update before_script.msvc.sh
...
Wrap in quites
7 years ago
c474709127
Update before_script.msvc.sh
7 years ago
ca0f6fff4a
Update before_script.msvc.sh
7 years ago
dc48a46e50
Update before_script.msvc.sh
7 years ago
a6d6dd5995
updating for the nits
7 years ago
8811c7141a
Update before_script.msvc.sh
...
taking nits into account :)
7 years ago
c2ff30c4d7
correcting from GH/AV feedback, testing on GL.
7 years ago
a532aef935
Update before_script.msvc.sh
...
updating version check and correct indentation, wrap BOOST_SDK in "" to support dirs with spaces.
7 years ago
4c0e475092
Update before_script.msvc.sh
...
Use powershell trick with boost_temp so there is little chance of collision.
7 years ago
bccd83c656
Use 1.67
7 years ago
bc830a9c45
use boost_temp
7 years ago
63bbc77ee7
try using the powershell trick from AnyOldName3
7 years ago
3379eafd33
Update before_script.msvc.sh
7 years ago
3ceb9116de
Give pwd -W a try
7 years ago
c4a4111b2e
Update before_script.msvc.sh
7 years ago
fb6ad9faec
try %TMP% ?
7 years ago
4ad3d66629
try using just ${TMP}
7 years ago
8be52d228e
Update before_script.msvc.sh
...
small fixes
7 years ago
60ec340fa3
remove toolset_real, use just toolset, do proper comparison
7 years ago
71314f0c3a
Use boost 1.67 instead of 1.61
7 years ago
46575d8de7
Update before_script.msvc.sh
...
1.61 -> 1.67
7 years ago
660193ae1b
Update before_script.msvc.sh
...
This has working GL Win10 MSVC updates, should be cross-compatible with appveyor.
7 years ago
1c4363eaa6
Using SYSTEMDRIVE because TEMP apparently means something different in bash then to windows cmd.
7 years ago
7bf502dd02
Bash it out!
7 years ago
1061270ac0
Try using @TEMP@ instead of hard coding it.
7 years ago
45d77372a0
with 260 char path fixed, this should work.
7 years ago
f17426cbcd
give boost 1.67 a spin with msvc 14.1
7 years ago
bd602847b5
fix broken QT 5.7.0 link
7 years ago
59a4251a6a
try to extract boost higher up in dir, then move.
7 years ago
b6fc204dd3
be more aggressive about suppressing message boxes
7 years ago
f7e1083ba4
get more output from boost
7 years ago
e068ee3533
tell unzip to overwrite all files
7 years ago
308d78e3da
only download via curl if file on server is different than what is currently cached on VM.
7 years ago
ae4cb0c3ee
no need for macos_qt_formula since on osx there is no more qt4, just qt5
7 years ago
9df59720e4
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
7 years ago
90ccf5b42b
[macOS, CI] Build using macOS 10.13 SDK
7 years ago
553094669b
Merge upstream/master (& fix merge conflicts)
7 years ago
2a3c74bfcc
Merge pull request #447 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
937cbfa0a1
small commit to rigger AV
7 years ago
a1ab1dc7fe
Add easily understood error messages to the prebuild script instead of vague/silent failures.
7 years ago
c20a0c72c5
Merge pull request #442 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
7 years ago
d73c6ebe60
Merge pull request #1721 from akortunov/appveyor
...
AppVeyor: build with Release configuration
7 years ago
de2513653e
AppVeyor: build with Release configuration
7 years ago
759e6fb804
Merge remote-tracking branch 'refs/remotes/upstream/master'
7 years ago
669d4d3d7e
Merge pull request #440 from OpenMW/master
...
Add OpenMW commits up to 27 May 2018
7 years ago
ba3a02ad05
[macOS, CI] Do not upload a nightly if there's already one of the same commit
7 years ago
9ff31cc80d
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
7 years ago
psi29a
elsid
David Cernat
Nikolay Kasyanov
Andrei Kortunov
naratzul
Alexander Olofsson
Chris Djali
Koncord
Nikolay Kasyanov
AnyOldName3
Azdul
Stanislaw Halik
Capostrophic