Commit Graph

406 Commits (59cb31e0a788c8a9b7071a63d321da29fbb72ffd)

Author SHA1 Message Date
David Cernat 59cb31e0a7 Add OpenMW commits up to 20 Mar 2021
# Conflicts:
#   apps/openmw/CMakeLists.txt
#   apps/openmw/mwmechanics/aipursue.cpp
#   components/CMakeLists.txt
4 years ago
psi29a a4719ffdf3 Merge branch 'fix-windows-theme' into 'master'
Deploy Qt style DLL

Closes #5907

See merge request OpenMW/openmw!667
4 years ago
AnyOldName3 b38a817600 Ensure vswhere finds us a single suitable MSVC installation
Also document the numerous arguments to achieve this.
4 years ago
AnyOldName3 1c296a1a78 Deploy Qt style DLL 4 years ago
Bret Curtis 9fbb530dde be explicit and print version information to verification 4 years ago
Bret Curtis 53cb20454f add path hack only to verify, will remove later 4 years ago
Bret Curtis f03beb7963 uninstall qt@6 4 years ago
Bret Curtis 8fc0f965bb which qmake? 4 years ago
Bret Curtis 87ede9284b be more explicit 4 years ago
Bret Curtis 17059cefea give qt@5 a try 4 years ago
Bret Curtis caa8b0ca1a give qt5 a show for brew 4 years ago
Bret Curtis 28cb14289a initial attempt at FindRecastNavigation.cmake 4 years ago
David Cernat 39dc6fc355 Add OpenMW commits up to 24 Feb 2021
# Conflicts:
#   CI/before_script.linux.sh
#   CMakeLists.txt
#   apps/openmw/CMakeLists.txt
#   components/CMakeLists.txt
4 years ago
David Cernat e1259fdc41 Add OpenMW commits up to 4 Feb 2021
# Conflicts:
#   apps/openmw/engine.cpp
#   apps/openmw/mwmechanics/npcstats.hpp
#   apps/openmw/mwrender/globalmap.cpp
4 years ago
Gleb Mazovetskiy 2798db5418 CI/before_script.linux.sh: <tab> -> 4 spaces and remove unused ENV 4 years ago
Gleb Mazovetskiy 99ba45a308 Optional static builds of OSG, MyGUI, Bullet 4 years ago
psi29a 4974b64cbf Update CI/before_install.osx.sh 4 years ago
David Cernat 08e3e9af76 [CI] Assign execution permission to before_script_linux.sh 4 years ago
David Cernat da3316daf8 Add OpenMW commits up to 4 Jan 2021
# Conflicts:
#   CMakeLists.txt
#   apps/openmw/main.cpp
#   apps/openmw/mwmechanics/npcstats.hpp
#   apps/openmw/mwphysics/actor.cpp
#   apps/openmw/mwphysics/mtphysics.hpp
#   components/CMakeLists.txt
4 years ago
wareya 18ef32ca82 values for this higher than sGroundOffset cause jittering on some surface; use safe-seeming value slightly less than sGroundOffset 4 years ago
David Cernat 4620adc662 Add OpenMW commits up to 30 Nov 2020
# Conflicts:
#   CMakeLists.txt
#   apps/openmw/mwphysics/actor.cpp
4 years ago
AnyOldName3 211894a178 Fix extraction with 7z 9.10
This is still used in the wild as lots of people install 7zip and never update it because it works. We can't check the version and abort if it's too old as the changelog doesn't make it clear which version fixed the behaviour.
4 years ago
David Cernat 676481d061 Add OpenMW commits up to 14 Nov 2020
# Conflicts:
#   .travis.yml
#   apps/openmw/mwmechanics/tickableeffects.cpp
4 years ago
corristo b8ed3b0059 [macOS, CI] Update dependencies, don't use lz4 from Homebrew
Also, enable double precision support for Bullet.
4 years ago
David Cernat 7f435ceeac Add OpenMW commits up to 1 Nov 2020
# Conflicts:
#   CMakeLists.txt
#   apps/openmw/main.cpp
#   apps/openmw/mwclass/container.hpp
#   apps/openmw/mwclass/creature.hpp
#   apps/openmw/mwclass/npc.hpp
#   apps/openmw/mwdialogue/dialoguemanagerimp.hpp
#   apps/openmw/mwdialogue/journalimp.hpp
#   apps/openmw/mwgui/container.cpp
#   apps/openmw/mwgui/dialogue.hpp
#   apps/openmw/mwgui/mainmenu.cpp
#   apps/openmw/mwgui/windowmanagerimp.hpp
#   apps/openmw/mwmechanics/aiactivate.hpp
#   apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
#   apps/openmw/mwscript/containerextensions.cpp
#   apps/openmw/mwscript/interpretercontext.hpp
#   components/CMakeLists.txt
4 years ago
psi29a c86094e4db Bump to C++17 4 years ago
Bret Curtis 06689cfe2a bingo; cleanup 4 years ago
Bret Curtis 8b5aa4c001 try for link overwriting 4 years ago
Bret Curtis c3b464a0c8 brew reinstall lz4; purge /tmp/openmw-deps just in case 4 years ago
Bret Curtis 0719b75307 try to use brew version of lz4 4 years ago
psi29a 7b1cd8a72f use LZ4_1.9.2 instead of LZ4_1.9.2 4 years ago
psi29a 1278d3b784 make sure to use new path and trick caching 4 years ago
psi29a c0e3f1c7ce Update CI/before_script.msvc.sh 4 years ago
psi29a b3e27fae4c use updated msvc lz4 provided by anyoldname3 4 years ago
Alexei Dobrohotov d6612eef20 Fix indentation 4 years ago
Bret Curtis 503bf7f78b added lz4 to our macos deps; let us see if that works 4 years ago
Bret Curtis edd6a329ee tell 7z to extract to specific directory 4 years ago
Bret Curtis e280a36701 correct filename of lz4 archive; fix indentation 4 years ago
Bret Curtis 7954dccb44 lz4 prep work; get linux and windows ready 4 years ago
psi29a b222872446 Android build on gitlab 4 years ago
David Cernat 68837aaf4a Add OpenMW commits up to 15 Oct 2020
# Conflicts:
#   .travis.yml
#   CI/before_script.linux.sh
#   CMakeLists.txt
#   apps/openmw/mwgui/containeritemmodel.cpp
#   apps/openmw/mwgui/tradewindow.cpp
#   apps/openmw/mwphysics/actor.cpp
#   apps/openmw/mwworld/actionteleport.cpp
#   apps/openmw/mwworld/containerstore.cpp
4 years ago
Bret Curtis b024518c18 Resolve 'shared_timed_mutex' is unavailable: introduced in macOS 10.12 4 years ago
AnyOldName3 ef41edba9b Install tools in before_install.osx.sh 4 years ago
elsid 23fe60a067
Run unit tests in a separate build 4 years ago
psi29a 1ddfb18cb3 Update CI/before_script.msvc.sh 4 years ago
David Cernat 0eedf8fd9f Add OpenMW commits up to 30 Sep 2020
# Conflicts:
#   apps/openmw/mwmechanics/aicombat.cpp
#   apps/openmw/mwmechanics/character.cpp
#   apps/openmw/mwmechanics/summoning.cpp
#   components/CMakeLists.txt
4 years ago
Bret Curtis c291bb169e fixed indentation and additional diffs 4 years ago
Bret Curtis 18899394c4 typo in path 4 years ago
Bret Curtis bf7e1bd32b make switch to using GL hosted windows deps 4 years ago
AnyOldName3 9e547e14d2 Allow setting up multiple build configurations at once
Also fix some bugs discovered in the process.

For multi-config generators, this basically just copies the DLLs for
each configuration, and for single-config, due to there being separate
build directories with separate extracted dependencies for each, it
defaults to just one, and will run the script several times if you
manually specify several.

Details include:
* Changing CONFIGURATION from a string to an array called
  CONFIGURATIONS. This gets iterated over in a bunch of places.
* Fixing a typo of 'cannot'
* Making the DLL lists arrays per-config, too.
* Some handling for the recursive stuff and a warning if configurations
  are set with a multi-config generator.
* Moving the configuration name sanitisation after they've been set.
* Myriad changes to Google Test:
  - Build it in a directory specific to the build tools - previously,
    having an MSVC 2017 and MSVC 2019 build on the same machine was
    impossible if unit tests were on, even though it's allowed otherwise
  - Use either Debug or Release Google Test as its finder isn't looking
    for RelWithDebInfo or capable of dealing with it if we try and use
    it anyway.
  - Always build Google Test with MSBuild as it's much less hassle due
    to CMake setting up the environment for us. Currently, MSVC always
    comes with something that can build solution files, no matter how
    you get it, so this shouldn't upset anyone.
  - Use CMake's --install mode so we can set the install prefix in the
    place that uses it.
  - Pass CMake both Debug and Release Google Test instead of risking a
    C/C++ library configuration mismatch causing linker and runtime
    errors - it'll pick a suitable one for each configuration.
  - Pass the library type explicitly as CMake can't cope without a
    Release library if you only gave it Debug, due to accessing a
    Release-specific variable unconditionally.
* Remove the -legacy flag from vswhere as it's only needed for MSVC
  2015, which we don't support any more.
* Fix the -version argument for vswhere as I'd massively cocked it up.
  I don't know how that happened as I did test it on a machine with
  multiple MSVC versions installed, which was the failure case, but it
  didn't fail then.
4 years ago