mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 17:29:55 +00:00
Code Issues Releases Wiki Activity
35153 commits 107 branches 66 tags 133 MiB
Commit graph

551 commits

Author SHA1 Message Date
elsid
e1c525914c
Add CI jobs to build tests in debug mode 2021-07-11 01:10:55 +02:00
Petr Mikheev
9a5229a821 Temporary fix for MacOS build. Remove this commit after resolving #5990. 2021-07-09 20:03:27 +02:00
Petr Mikheev
9e168fd9cc Add Lua/LuaJit and sol3 to openmw 2021-07-09 19:27:00 +02:00
AnyOldName3
3014963145 Fail on bad download instead of downloading HTML 404 page 2021-07-04 15:20:27 +00:00
psi29a
a0659cd017 Merge branch 'bump_windows_deps' into 'master' 
bump windows build deps to OSGoS 3.6 and MyGUI 3.4.1

See merge request OpenMW/openmw!938
 2021-06-19 00:13:08 +00:00
Bret Curtis
7be09078b4 bump mac deps to include collada 2021-06-17 01:12:31 +02:00
Bret Curtis
4ffc30f502 add OSGoS hash 2021-06-12 16:06:22 +02:00
Bret Curtis
fced78b66a bump windows build deps to OSGoS 3.6 and MyGUI 3.4.1 2021-06-12 15:35:40 +02:00
Bret Curtis
91e1898aa2 make use of gitlab openmw-deps 2021-06-11 20:27:17 +02:00
Bret Curtis
49ce26361e update mac deps to include latest OSGoS 3.6, mygui 3.4.1 and multi-threaded bullet 2021-06-11 16:44:15 +02:00
elsid
4d7e5245a3
Support benchmarks for windows 
Don't run the binary because gitlab can't execute it successfully due to
unknown reason.
 2021-05-11 13:16:59 +02:00
elsid
6492e9522a
Run benchmarks on gitlab CI 2021-05-10 00:21:03 +02:00
psi29a
1e9a7894d5 Merge branch 'no_recommends' into 'master' 
Don't install recommended packages in Debian's CI

See merge request OpenMW/openmw!756
 2021-05-05 11:45:59 +00:00
jvoisin
885ff36b01 Don't install recommended packages in Debian's CI 2021-05-05 11:45:59 +00:00
Bret Curtis
4129cc244c allow macos11xcode12 to fail for now; but not macos10.15xcode11; add support for macos10.14_xcode10; make sure fontconfig does not update other stuff 2021-05-05 13:35:39 +02:00
Bret Curtis
a1bc10888c add implicit dependancy fontconfig for macos 2021-05-05 11:46:59 +02:00
psi29a
7f7041656d Merge branch 'enforce_double_bullet' into 'master' 
Remove support for single-precision Bullet, fail during configuration instead of during linking (#5980)

See merge request OpenMW/openmw!806
 2021-05-02 20:52:57 +00:00
fredzio
6fd04cb8f6 Remove support for single-precision Bullet, fail during configuration instead of during linking. 2021-05-02 17:48:50 +02:00
psi29a
aca5d2fc12 Merge branch 'bump-macos-dependencies' into 'master' 
Use prebuilt macOS dependencies with fixed SDL and OSG 3.6

Closes #5939

See merge request OpenMW/openmw!804

(cherry picked from commit 74612b1286330b1e34a9c37528502770496e5bba)

9aaca972 Use prebuilt macOS dependencies with fixed SDL and OSG 3.6
 2021-05-02 13:56:31 +00:00
AnyOldName3
a8c5fc74d1 Massively simplify the worst Bash ever 2021-04-28 06:51:15 +00:00
jvoisin
ce654b0504 Don't run brew uninstall outside of travis-ci 2021-04-23 19:21:33 +02:00
nighthawk469
511d3344fe Revert CMAKE_OSX_SYSROOT as this interferes with the gitlab ci builds. 2021-04-22 23:43:30 +00:00
nighthawk469
03bb569995 Revert Xcode sdk version from 11.6 to 10.2 2021-04-22 18:41:02 +00:00
jvoisin
dc10ab7bad Install curl in the coverity job 2021-04-12 11:26:33 +02:00
elsid
010f290fd5
Update OSX deployment target to 10.14 
To support std::variant
 2021-04-11 14:07:15 +02:00
Max
72a2e3722e update syntax 2021-03-24 14:01:40 -07:00
Max
91bca0cb1f attempt to fix build issue 2021-03-24 13:28:34 -07:00
AnyOldName3
4862e8c8f4 Bump aqt version 2021-03-21 21:30:17 +00:00
psi29a
a4719ffdf3 Merge branch 'fix-windows-theme' into 'master' 
Deploy Qt style DLL

Closes #5907

See merge request OpenMW/openmw!667
 2021-03-18 08:27:52 +00:00
AnyOldName3
b38a817600 Ensure vswhere finds us a single suitable MSVC installation 
Also document the numerous arguments to achieve this.
 2021-03-17 23:29:48 +00:00
AnyOldName3
1c296a1a78 Deploy Qt style DLL 2021-03-17 18:11:36 +00:00
Bret Curtis
9fbb530dde be explicit and print version information to verification 2021-03-05 13:25:46 +01:00
Bret Curtis
53cb20454f add path hack only to verify, will remove later 2021-03-05 13:20:03 +01:00
Bret Curtis
f03beb7963 uninstall qt@6 2021-03-05 13:12:42 +01:00
Bret Curtis
8fc0f965bb which qmake? 2021-03-05 13:10:22 +01:00
Bret Curtis
87ede9284b be more explicit 2021-03-05 13:08:38 +01:00
Bret Curtis
17059cefea give qt@5 a try 2021-03-05 13:07:26 +01:00
Bret Curtis
caa8b0ca1a give qt5 a show for brew 2021-03-05 13:03:21 +01:00
Bret Curtis
28cb14289a initial attempt at FindRecastNavigation.cmake 2021-03-02 22:48:17 +01:00
Gleb Mazovetskiy
2798db5418 CI/before_script.linux.sh: <tab> -> 4 spaces and remove unused ENV 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
99ba45a308 Optional static builds of OSG, MyGUI, Bullet 2021-01-26 19:00:55 +00:00
psi29a
4974b64cbf Update CI/before_install.osx.sh 2021-01-17 15:58:43 +00:00
wareya
18ef32ca82 values for this higher than sGroundOffset cause jittering on some surface; use safe-seeming value slightly less than sGroundOffset 2020-12-27 22:16:11 +00:00
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.
 2020-11-17 16:14:05 +00:00
corristo
b8ed3b0059 [macOS, CI] Update dependencies, don't use lz4 from Homebrew 
Also, enable double precision support for Bullet.
 2020-11-10 08:21:46 +00:00
psi29a
c86094e4db Bump to C++17 2020-10-20 23:38:05 +02:00
Bret Curtis
06689cfe2a bingo; cleanup 2020-10-20 23:22:37 +02:00
Bret Curtis
8b5aa4c001 try for link overwriting 2020-10-20 23:06:08 +02:00
Bret Curtis
c3b464a0c8 brew reinstall lz4; purge /tmp/openmw-deps just in case 2020-10-20 23:00:37 +02:00
Bret Curtis
0719b75307 try to use brew version of lz4 2020-10-20 22:28:09 +02:00
psi29a
7b1cd8a72f use LZ4_1.9.2 instead of LZ4_1.9.2 2020-10-20 07:35:02 +00:00
psi29a
1278d3b784 make sure to use new path and trick caching 2020-10-19 22:36:34 +00:00
psi29a
c0e3f1c7ce Update CI/before_script.msvc.sh 2020-10-19 21:59:44 +00:00
psi29a
b3e27fae4c use updated msvc lz4 provided by anyoldname3 2020-10-19 20:29:22 +00:00
Alexei Dobrohotov
d6612eef20 Fix indentation 2020-10-19 22:31:42 +03:00
Bret Curtis
503bf7f78b added lz4 to our macos deps; let us see if that works 2020-10-19 22:31:42 +03:00
Bret Curtis
edd6a329ee tell 7z to extract to specific directory 2020-10-19 22:31:42 +03:00
Bret Curtis
e280a36701 correct filename of lz4 archive; fix indentation 2020-10-19 22:31:42 +03:00
Bret Curtis
7954dccb44 lz4 prep work; get linux and windows ready 2020-10-19 22:31:42 +03:00
psi29a
b222872446 Android build on gitlab 2020-10-19 08:27:38 +00:00
Bret Curtis
b024518c18 Resolve 'shared_timed_mutex' is unavailable: introduced in macOS 10.12 2020-10-15 11:12:23 +02:00
AnyOldName3
ef41edba9b Install tools in before_install.osx.sh 2020-10-09 13:56:21 +00:00
elsid
23fe60a067
Run unit tests in a separate build 2020-10-03 00:19:29 +02:00
psi29a
1ddfb18cb3 Update CI/before_script.msvc.sh 2020-10-02 21:07:46 +00:00
Bret Curtis
c291bb169e fixed indentation and additional diffs 2020-09-29 13:29:12 +02:00
Bret Curtis
18899394c4 typo in path 2020-09-29 13:13:26 +02:00
Bret Curtis
bf7e1bd32b make switch to using GL hosted windows deps 2020-09-29 12:21:25 +02:00
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.
 2020-09-08 00:18:18 +01:00
AnyOldName3
f4db29a717 Kill BUILD_CONFIG 
It was basically just CONFIGURATION but less confusing. CONFIGURATION
could just be less confusing.
 2020-09-04 00:45:41 +01: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
descawed
58e0b34adc Verify certificates when downloading dependencies 2020-08-03 22:59:08 +00: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
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
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
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
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
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
elsid
66da72048a
Update bullet for windows up to 2.87 2020-05-13 19:24:29 +02:00
elsid
4e0c07de0f
Build install target in CI 2020-05-10 19:39:32 +02:00
elsid
99cd99bc3b
Remove unused BUILD_MYGUI_PLUGIN option 2020-05-09 19:42:36 +02:00
elsid
ca649003ed
Use googletest 1.10.0 
To get support for INSTANTIATE_TEST_SUITE_P macro
 2020-05-02 17:56:32 +02:00
Bret Curtis
0d10293f24
everything is implied yes 2020-04-17 15:10:05 +02:00
Bret Curtis
9698c21b36
build bsa and esm tools 2020-04-17 13:50:54 +02:00
Nikolay Kasyanov
c8596f782a [macOS, CI] Use prebuilt dependencies with SDL2 2.0.12 2020-04-01 19:57:04 +04:00
Andrei Kortunov
d2acac0ebe Fix Qt download link for Windows 2020-03-23 17:40:30 +04:00
Bret Curtis
444d667d22 give sdl2 2.0.12 for windows a try 2020-03-22 23:07:07 +01:00
Bret Curtis
42640b7811 no need to re-map when using system default 2020-03-22 21:34:46 +01:00
Bret Curtis
5091e2c371 bump to bionic; gcc-9 and clang-10 2020-03-22 20:56:48 +01:00
elsid
c690f2d43d
Disable coverage for travis CI 2020-01-26 22:09:48 +01:00
Andrei Kortunov
ed31b8c467 Attempt to fix MacOS CI 2019-12-21 12:27:56 +04:00
Andrei Kortunov
05a8702b6e Fix Boost 1.70+ detection 2019-11-28 16:46:18 +04:00
Bret Curtis
5a8bfac4df hard code Qt to version 2019-10-21 15:40:38 +02:00
Bret Curtis
e7caf7a037 bump that qt 2019-10-21 15:38:10 +02:00
Bret Curtis
4c94fcd52b add msvc2019 and ditch msvc2015 2019-10-21 14:28:12 +02:00
naratzul
0220bcdef3 Add Visual Studio 2019 support 2019-10-12 11:08:43 +05:00
Nikolay Kasyanov
c89876538d Fix macOS nightly preupload check 
Previously, it was always ls'ing home directory.
 2019-04-06 18:21:33 +02:00
Nikolay Kasyanov
d305e1933a Get ccache path from Homebrew 
Also, don't use legacy syntax to get Qt path.
 2019-03-31 17:41:16 +02:00
Nikolay Kasyanov
95ae9c4ac8 Don't downgrade CMake 2019-03-31 17:16:14 +02:00
Nikolay Kasyanov
a11c391231 Enable ccache for macOS CI 2019-03-31 17:16:14 +02:00
Bret Curtis
8c1a73ff11
Merge pull request #2220 from elsid/ccache 
Use ccache for linux CI build
 2019-03-07 12:21:05 +01:00
elsid
26dfa287f9
Use ccache for linux CI build 2019-03-07 11:17:51 +03:00
elsid
7d2c741d1d
Fix compare with empty value 2019-03-07 00:33:26 +03:00
elsid
e99f783c65
Remove white spaces and trailing spaces 2019-03-07 00:33:26 +03:00
Alexander Olofsson
f8118272f4
Package FreeType plugin for OSG in Windows 
Fixes #4872
 2019-02-22 18:37:49 +01:00
Chris Djali
cb5a57e41b
Merge pull request #1547 from AnyOldName3/osgshadow-test-vdsm 
Shadows
 2019-02-20 15:35:49 +00:00
Nikolay Kasyanov
cdbd3a9c09
Fix macOS CI 
It looks like Homebrew has deprecated some syntax making CMake formula invalid, now a for of the formula is used.
 2019-02-04 21:32:54 +01:00
AnyOldName3
8482236a82 Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2019-01-24 23:09:23 +00:00
Azdul
6d8215ecb6 Google Test / Google Mock / OpenMW unit tests on Windows 2019-01-23 14:21:03 +01:00
Nikolay Kasyanov
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.
 2019-01-20 11:03:37 +01:00
Nikolay Kasyanov
9cce6ecfe3 [macOS] Update deploy script to use ssh/scp 2019-01-16 23:04:26 +01:00
Nikolay Kasyanov
956934911a [macOS, CI] Use CMake 3.12.4 
See https://gitlab.com/OpenMW/openmw/issues/4767 for details.
 2018-12-26 10:17:32 +01:00
Bret Curtis
8e113a32b2
Merge pull request #2081 from nikolaykasyanov/unneed-macos-files 
Remove unnecessary Recastnavigation headers & static libs from macOS package
 2018-12-21 17:47:15 +01:00
Nikolay Kasyanov
e0161bb2bf Update macOS dependencies, use Xcode 10.1 2018-12-20 22:36:06 +01:00
Nikolay Kasyanov
f98a454ec1 Add a script to verify macOS package contents 2018-12-20 21:18:41 +01:00
AnyOldName3
e2515f6db7 Merge branch 'master' into osgshadow-test-vdsm 2018-12-18 19:51:27 +00:00
AnyOldName3
2a2d9f0006 Fix if statements 2018-12-07 15:03:36 +00:00
AnyOldName3
14fcb9158f Add NMake support to the Windows prebuild script. 2018-12-07 14:46:32 +00:00
AnyOldName3
642002b302 Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2018-11-29 01:19:01 +00:00
Bret Curtis
fc15fa0a89 we now have gcc-5 _and_ gcc-8, along with QT5 and use system tinyxml 2018-11-14 21:14:14 +01:00
Alexander Olofsson
f8f66b83b6 Update OpenAL-soft to 1.19.1 2018-11-13 22:17:04 +01:00
Bret Curtis
461ba74d6d
Merge pull request #2017 from sthalik/pr/allow-build-under-cygwin-msys2-etc 
fix build with CI dependencies on all Cygwin derivatives
 2018-11-09 10:07:36 +01:00
Bret Curtis
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
 2018-11-08 17:38:09 +01:00
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.
 2018-11-03 20:19:44 +01:00
Andrei Kortunov
f88d5e808c Rewrite media decoder to use FFMpeg 3.2+ API (task #4686) 2018-11-03 22:34:25 +04:00
AnyOldName3
d0c254bc7e Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2018-11-01 16:48:21 +00:00
elsid
792a0585c0 Add recastnavigation as subdirectory 2018-11-01 17:01:22 +01:00
AnyOldName3
afd700dab9 Ensure different Boost versions get different names 2018-10-31 23:38:10 +00:00
AnyOldName3
3785ba6aa0 Merge upstream/master 2018-10-30 22:38:09 +00:00
elsid
49d81241db Merge branch 'master' into pathfinder_detour 2018-10-28 17:08:09 +03:00
Nikolay Kasyanov
f62ca24356 [macOS, CI] Use dependencies with downgraded MyGUI, fixing #4665 2018-10-26 19:33:04 +02:00
elsid
3d97e96f55
Add dependency to recastnavigation 2018-10-13 22:16:25 +03:00
AnyOldName3
0124be5713 Merge upstream/master 2018-10-10 21:23:19 +01:00
Capostrophic
e627f49df4 Fix AppVeyor build 2018-10-07 20:22:52 +03:00
elsid
2073218fc6
Use specific googletest version 2018-09-28 22:39:27 +03:00
AnyOldName3
80082308f0 Merge upstream (shadermanager log system revamp) 2018-08-17 18:22:13 +01:00
elsid
ef631a0961
Add dependency for GMock 2018-08-11 16:52:53 +03:00
AnyOldName3
cc23a968d1 Merge upstream/master 2018-08-01 14:13:45 +01:00
Bret Curtis
84b80ae405 no spaces in assignment 2018-07-22 23:12:37 +00:00
Bret Curtis
b910106713 Catch an unbound variable before it happens. 2018-07-22 07:17:34 +00:00
Bret Curtis
739c49d59b Merge branch 'master' into 'win10_ci' 
# Conflicts:
#   CI/before_script.msvc.sh
 2018-07-04 15:21:45 +00:00
Bret Curtis
57e2573593
Update before_script.msvc.sh 
check if temp directory exists, error out and warn user about it.
 2018-07-03 15:59:51 +02:00
Bret Curtis
70e9d5c0a0 ; it? 2018-07-03 13:53:13 +00:00
Bret Curtis
11030e56c4 detect existing dir 2018-07-03 13:41:06 +00:00
Bret Curtis
4f07ca28a6 Try passing the _real_ windows dir to innoinstaller, then using the linux-like directory for mv. 2018-07-03 13:00:19 +00:00
Bret Curtis
d4c9586bd0 try just converting the \ to a / 2018-07-03 12:53:30 +00:00
Bret Curtis
af75c1e909
Update before_script.msvc.sh 
reverting back to what works
 2018-06-30 08:40:21 +02:00
Bret Curtis
4d60fe5a76 reverting back 2018-06-30 06:10:26 +00:00
Bret Curtis
b8b07b52f0 try this... 2018-06-29 22:42:12 +00:00
Bret Curtis
4177fd04eb
Update before_script.msvc.sh 
Does it blend?
 2018-06-29 21:08:42 +02:00
Bret Curtis
209359bbc3 Try this on for size... 2018-06-29 19:07:39 +00:00
Bret Curtis
78a3f95ee4 Update before_script.msvc.sh 2018-06-29 18:03:25 +00:00
Bret Curtis
2bf0d598cf
Update before_script.msvc.sh 
Wrap in quites
 2018-06-29 20:01:35 +02:00
Bret Curtis
c474709127
Update before_script.msvc.sh 2018-06-29 15:26:11 +02:00
Bret Curtis
ca0f6fff4a Update before_script.msvc.sh 2018-06-29 13:25:36 +00:00
Bret Curtis
dc48a46e50 Update before_script.msvc.sh 2018-06-29 13:22:07 +00:00
Bret Curtis
a6d6dd5995 updating for the nits 2018-06-29 13:17:19 +00:00
Bret Curtis
8811c7141a
Update before_script.msvc.sh 
taking nits into account :)
 2018-06-29 15:14:23 +02:00
Bret Curtis
c2ff30c4d7 correcting from GH/AV feedback, testing on GL. 2018-06-29 09:33:51 +00:00
Bret Curtis
a532aef935
Update before_script.msvc.sh 
updating version check and correct indentation, wrap BOOST_SDK in "" to support dirs with spaces.
 2018-06-29 11:31:37 +02:00
Bret Curtis
4c0e475092
Update before_script.msvc.sh 
Use powershell trick with boost_temp so there is little chance of collision.
 2018-06-29 10:16:28 +02:00
Bret Curtis
bccd83c656 Use 1.67 2018-06-29 08:09:41 +00:00
Bret Curtis
bc830a9c45 use boost_temp 2018-06-29 08:00:54 +00:00
Bret Curtis
63bbc77ee7 try using the powershell trick from AnyOldName3 2018-06-29 07:51:45 +00:00
Bret Curtis
3379eafd33 Update before_script.msvc.sh 2018-06-28 20:44:22 +00:00
Bret Curtis
3ceb9116de Give pwd -W a try 2018-06-28 20:28:58 +00:00
Bret Curtis
c4a4111b2e Update before_script.msvc.sh 2018-06-28 15:33:32 +00:00
Bret Curtis
fb6ad9faec try %TMP% ? 2018-06-28 15:23:56 +00:00
Bret Curtis
4ad3d66629 try using just ${TMP} 2018-06-28 14:18:58 +00:00
Bret Curtis
8be52d228e
Update before_script.msvc.sh 
small fixes
 2018-06-28 15:12:26 +02:00
Bret Curtis
60ec340fa3 remove toolset_real, use just toolset, do proper comparison 2018-06-28 12:18:01 +00:00
Bret Curtis
71314f0c3a Use boost 1.67 instead of 1.61 2018-06-28 12:03:52 +00:00
Bret Curtis
46575d8de7
Update before_script.msvc.sh 
1.61 -> 1.67
 2018-06-28 14:01:41 +02:00
Bret Curtis
660193ae1b
Update before_script.msvc.sh 
This has working GL Win10 MSVC updates, should be cross-compatible with appveyor.
 2018-06-28 13:59:23 +02:00
Bret Curtis
1c4363eaa6 Using SYSTEMDRIVE because TEMP apparently means something different in bash then to windows cmd. 2018-06-28 11:22:54 +00:00
Bret Curtis
7bf502dd02 Bash it out! 2018-06-28 11:09:27 +00:00
Bret Curtis
1061270ac0 Try using @TEMP@ instead of hard coding it. 2018-06-28 11:05:10 +00:00
Bret Curtis
45d77372a0 with 260 char path fixed, this should work. 2018-06-28 10:41:12 +00:00
Bret Curtis
f17426cbcd give boost 1.67 a spin with msvc 14.1 2018-06-27 20:24:08 +00:00
Bret Curtis
bd602847b5 fix broken QT 5.7.0 link 2018-06-27 15:07:53 +00:00
Bret Curtis
59a4251a6a try to extract boost higher up in dir, then move. 2018-06-27 14:36:20 +00:00
Bret Curtis
b6fc204dd3 be more aggressive about suppressing message boxes 2018-06-27 14:02:30 +00:00
Bret Curtis
f7e1083ba4 get more output from boost 2018-06-27 13:34:37 +00:00
Bret Curtis
e068ee3533 tell unzip to overwrite all files 2018-06-26 14:01:10 +00:00
Bret Curtis
308d78e3da only download via curl if file on server is different than what is currently cached on VM. 2018-06-26 13:54:37 +00:00
Bret Curtis
ae4cb0c3ee no need for macos_qt_formula since on osx there is no more qt4, just qt5 2018-06-26 13:50:45 +00:00
AnyOldName3
9df59720e4 Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2018-06-24 23:41:14 +01:00
Nikolay Kasyanov
90ccf5b42b [macOS, CI] Build using macOS 10.13 SDK 2018-06-20 19:59:55 +02:00
AnyOldName3
553094669b Merge upstream/master (& fix merge conflicts) 2018-06-20 00:11:23 +01:00
Bret Curtis
937cbfa0a1
small commit to rigger AV 2018-06-07 17:09:39 +02:00
AnyOldName3
a1ab1dc7fe Add easily understood error messages to the prebuild script instead of vague/silent failures. 2018-06-07 15:28:45 +01:00
Bret Curtis
d73c6ebe60
Merge pull request #1721 from akortunov/appveyor 
AppVeyor: build with Release configuration
 2018-05-29 10:25:02 +02:00
Andrei Kortunov
de2513653e AppVeyor: build with Release configuration 2018-05-28 09:08:30 +04:00
AnyOldName3
759e6fb804 Merge remote-tracking branch 'refs/remotes/upstream/master' 2018-05-27 15:41:42 +01:00
Nikolay Kasyanov
ba3a02ad05 [macOS, CI] Do not upload a nightly if there's already one of the same commit 2018-05-24 23:00:59 +02:00
AnyOldName3
9ff31cc80d Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2018-05-22 00:14:07 +01:00
Alexander "Ananace" Olofsson
d05de8e411
Give boost the correct toolset for 2017 2018-05-20 18:51:28 +02:00
Alexander "Ananace" Olofsson
3bd8dc3ef6
Use the right boost version for Appveyor 2018-05-20 18:22:02 +02:00
Alexander "Ananace" Olofsson
bcfa2a13a6
Use the VS2017 packaging of Qt5 for Appveyor 2018-05-20 18:09:31 +02:00
Alexander "Ananace" Olofsson
ea6c73333b
Bumping Qt to 5.10 for Appveyor 2018-05-20 17:14:32 +02:00
AnyOldName3
44b2cf2b7f Merge upstream. 2018-05-11 19:15:04 +01:00
bret curtis
4890ecd357 remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb 2018-03-27 20:20:40 +02:00
Harald H
d3b623b5d3 http to https for supported urls (#1625) 
* http to https for supported urls

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http tp https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* some url fixes

* http to https
 2018-03-08 21:23:24 +01:00
AnyOldName3
0e481a457e Merge remote-tracking branch 'refs/remotes/upstream/master' 2017-12-08 23:26:08 +00:00
Alexander "Ace" Olofsson
50deed126b
Update SDL to 2.0.7 2017-12-02 21:48:57 +01:00
Alexander "Ace" Olofsson
04af200ae8 Downgrade MyGUI to 3.2.2 for Windows builds 2017-10-28 13:37:41 +02:00
AnyOldName3
ef8a7d1cb9 Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2017-10-26 23:40:05 +01:00
Alexander "Ace" Olofsson
32bdd500af Updating OSG packages to 3.4.1 2017-10-22 23:13:01 +02:00
AnyOldName3
147455626e Merge OpenMW/master 2017-10-13 21:39:15 +01:00
AnyOldName3
20607bdcd9 Actually add shadow DLL under Windows automatically for real this time 2017-10-13 18:17:49 +01:00
AnyOldName3
c2cd338086 Add shadow DLL under Windows automatically 2017-10-13 18:05:25 +01:00
AnyOldName3
f8fe992dc0 Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files 2017-10-11 21:58:55 +01:00
AnyOldName3
b94bbe00cb Merge remote-tracking branch 'upstream/master' into osgshadow-test 2017-10-08 00:18:02 +01:00
Nikolay Kasyanov
c598f1313c [macOS, CI] Update dependencies 
The following changes are included:
- https://github.com/OpenMW/openmw-deps-mac/pull/37
- https://github.com/OpenMW/openmw-deps-mac/pull/38
 2017-10-03 17:34:45 +02:00
AnyOldName3
f50063402d Adjust shaders to support shadows 2017-09-21 00:25:48 +01:00
Nikolay Kasyanov
ffcdedced3 [macOS, CI] Use FTP URL from environment 
This URL is also subject to change, moving to Travis settings.
 2017-08-01 20:35:10 +02:00
scrawl
c23b75ab9a Merge pull request #1339 from PlutonicOverkill/vs2017-support 
Add Visual Studio 2017 support (Feature #3952)
 2017-07-25 21:07:34 +00:00
Nikolay Kasyanov
411b78562e [macOS, CI] Use most recent dependencies 
Includes a fix for https://bugs.openmw.org/issues/3904.
 2017-07-22 21:25:59 +02:00
PlutonicOverkill
0eb54fa96a Remove TOOLSET and XP_TOOLSET 2017-07-22 17:58:04 +12:00
PlutonicOverkill
2d7689b978 Add Visual Studio 2017 support 
The new VS2017 configuration uses all the same settings as the
VS2015 one, but uses a different generator.

CMake by default looks for Boost libraries based on the compiler
being used, but Boost only has binaries for VS2015, so a hack is
used to make sure it looks for the correct ones.

I don't know what TOOLSET and XP_TOOLSET are for but I left them
just in case.
 2017-07-14 12:07:16 +12:00