Commit Graph

242 Commits (22142668c7192b0c1bf90293edfd279411ada0b6)

Author SHA1 Message Date
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
wareya 18ef32ca82 values for this higher than sGroundOffset cause jittering on some surface; use safe-seeming value slightly less than sGroundOffset 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
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 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 1ddfb18cb3 Update CI/before_script.msvc.sh 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
AnyOldName3 f4db29a717 Kill BUILD_CONFIG
It was basically just CONFIGURATION but less confusing. CONFIGURATION
could just be less confusing.
4 years ago
descawed 58e0b34adc Verify certificates when downloading dependencies 4 years ago
Bret Curtis 4a17bf27a3 Set BULLET_ROOT via add_cmake_opts like we do the rest 5 years ago
Evil Eye fcc761c13c Update Windows CI script to download a version of Google Test that can actually compile the tests 5 years ago
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.
5 years ago
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.
5 years ago
Bret Curtis 61a5c6125d #5480: Drop Qt4 support and require Qt 5.12 or later. 5 years ago
AnyOldName3 36d0a55600 Add error message when vswhere doesn't find MSVC 5 years ago
AnyOldName3 a93ea93d9d Remove MSVC 2015 specific parts of CI script.
Also add error when MSVC 2015 is requested.
5 years ago
AnyOldName3 7ef3a9d8ac Remove schoolboy error 5 years ago
psi29a 9067894335 Merge branch 'set-e-kills-ret' into 'master'
Fix Windows prebuild script error messages

Closes #5459

See merge request OpenMW/openmw!223
5 years ago
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
5 years ago
apommel 4b831f99da Allow vswhere to detect build tools installations 5 years ago
Alexei Dobrohotov 09537ed312 Merge branch 'master' into 'AnyOldName3-master-patch-15901'
# Conflicts:
#   CI/before_script.msvc.sh
5 years ago
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.
5 years ago
AnyOldName3 0d2129ca13 Add success message to Windows prebuild script 5 years ago
AnyOldName3 13c4e4b2a9 Fix ifs for ACTIVATE_MSVC 5 years ago
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
5 years ago
AnyOldName3 6e267e398e Fix copy-paste snafu 5 years ago
AnyOldName3 86c1d0f4be Warn about fake stub Python 5 years ago
AnyOldName3 08e5d93c9b Print MSVC activation info in verbose mode, too. 5 years ago
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
5 years ago
Bret Curtis 9fd8470741
Merge branch 'master' into cherry-pick-e0b35232 5 years ago
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
5 years ago
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
5 years ago
elsid 66da72048a
Update bullet for windows up to 2.87 5 years ago
elsid 4e0c07de0f
Build install target in CI 5 years ago
elsid 99cd99bc3b
Remove unused BUILD_MYGUI_PLUGIN option 5 years ago
Bret Curtis 0d10293f24
everything is implied yes 5 years ago
Bret Curtis 9698c21b36
build bsa and esm tools 5 years ago
Andrei Kortunov d2acac0ebe Fix Qt download link for Windows 5 years ago
Bret Curtis 444d667d22 give sdl2 2.0.12 for windows a try 5 years ago
Bret Curtis 5a8bfac4df hard code Qt to version 5 years ago
Bret Curtis e7caf7a037 bump that qt 5 years ago
Bret Curtis 4c94fcd52b add msvc2019 and ditch msvc2015 5 years ago
naratzul 0220bcdef3 Add Visual Studio 2019 support 5 years ago
elsid 7d2c741d1d
Fix compare with empty value 6 years ago
elsid e99f783c65
Remove white spaces and trailing spaces 6 years ago
Alexander Olofsson f8118272f4
Package FreeType plugin for OSG in Windows
Fixes #4872
6 years ago
AnyOldName3 8482236a82 Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 6 years ago
Azdul 6d8215ecb6 Google Test / Google Mock / OpenMW unit tests on Windows 6 years ago
AnyOldName3 e2515f6db7 Merge branch 'master' into osgshadow-test-vdsm 6 years ago
AnyOldName3 2a2d9f0006 Fix if statements 6 years ago
AnyOldName3 14fcb9158f Add NMake support to the Windows prebuild script. 6 years ago
AnyOldName3 642002b302 Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 6 years ago
Alexander Olofsson f8f66b83b6 Update OpenAL-soft to 1.19.1 6 years ago
Stanislaw Halik 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
AnyOldName3 d0c254bc7e Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 6 years ago
elsid 792a0585c0 Add recastnavigation as subdirectory 6 years ago
AnyOldName3 afd700dab9 Ensure different Boost versions get different names 6 years ago
AnyOldName3 3785ba6aa0 Merge upstream/master 6 years ago
elsid 3d97e96f55
Add dependency to recastnavigation 6 years ago
AnyOldName3 0124be5713 Merge upstream/master 6 years ago
Capostrophic e627f49df4 Fix AppVeyor build 6 years ago
AnyOldName3 cc23a968d1 Merge upstream/master 7 years ago
Bret Curtis 84b80ae405 no spaces in assignment 7 years ago
Bret Curtis b910106713 Catch an unbound variable before it happens. 7 years ago
Bret Curtis 739c49d59b Merge branch 'master' into 'win10_ci'
# Conflicts:
#   CI/before_script.msvc.sh
7 years ago
Bret Curtis 57e2573593
Update before_script.msvc.sh
check if temp directory exists, error out and warn user about it.
7 years ago
Bret Curtis 70e9d5c0a0 ; it? 7 years ago
Bret Curtis 11030e56c4 detect existing dir 7 years ago
Bret Curtis 4f07ca28a6 Try passing the _real_ windows dir to innoinstaller, then using the linux-like directory for mv. 7 years ago
Bret Curtis d4c9586bd0 try just converting the \ to a / 7 years ago
Bret Curtis af75c1e909
Update before_script.msvc.sh
reverting back to what works
7 years ago
Bret Curtis 4d60fe5a76 reverting back 7 years ago
Bret Curtis b8b07b52f0 try this... 7 years ago
Bret Curtis 4177fd04eb
Update before_script.msvc.sh
Does it blend?
7 years ago
Bret Curtis 209359bbc3 Try this on for size... 7 years ago
Bret Curtis 78a3f95ee4 Update before_script.msvc.sh 7 years ago
Bret Curtis 2bf0d598cf
Update before_script.msvc.sh
Wrap in quites
7 years ago
Bret Curtis c474709127
Update before_script.msvc.sh 7 years ago
Bret Curtis ca0f6fff4a Update before_script.msvc.sh 7 years ago
Bret Curtis dc48a46e50 Update before_script.msvc.sh 7 years ago
Bret Curtis a6d6dd5995 updating for the nits 7 years ago
Bret Curtis 8811c7141a
Update before_script.msvc.sh
taking nits into account :)
7 years ago
Bret Curtis c2ff30c4d7 correcting from GH/AV feedback, testing on GL. 7 years ago
Bret Curtis a532aef935
Update before_script.msvc.sh
updating version check and correct indentation, wrap BOOST_SDK in "" to support dirs with spaces.
7 years ago
Bret Curtis 4c0e475092
Update before_script.msvc.sh
Use powershell trick with boost_temp so there is little chance of collision.
7 years ago
Bret Curtis bccd83c656 Use 1.67 7 years ago
Bret Curtis bc830a9c45 use boost_temp 7 years ago
Bret Curtis 63bbc77ee7 try using the powershell trick from AnyOldName3 7 years ago
Bret Curtis 3379eafd33 Update before_script.msvc.sh 7 years ago