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
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
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
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
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
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
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
Alexander Olofsson
f8f66b83b6
Update OpenAL-soft to 1.19.1
2018-11-13 22:17:04 +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
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
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
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
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
Andrei Kortunov
de2513653e
AppVeyor: build with Release configuration
2018-05-28 09:08:30 +04: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
f50063402d
Adjust shaders to support shadows
2017-09-21 00:25:48 +01: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
Alexander "Ace" Olofsson
fd03c76e68
And apparently they're only doing zips now
2017-05-06 09:38:14 +02:00
Alexander "Ace" Olofsson
ae05c37a46
Update Windows CI scripts to use ffmpeg 3.2.4
2017-05-06 09:21:02 +02:00
Alexander "Ace" Olofsson
cda83559aa
Update Bullet to 2.86
2017-02-10 11:37:36 +01:00
Alexander "Ace" Olofsson
123e57a65c
Include the OpenAL32.dll file into builds
2016-09-02 06:57:36 +02:00
Alexander "Ace" Olofsson
bcaf160eab
Add some missing Qt DLLs
2016-08-29 07:07:50 +02:00
Alexander "Ace" Olofsson
c93f7b90c5
Disable the version changing on AppVeyor
...
Apparently it breaks the build detail links on GitHub, not really
acceptable that.
2016-08-29 00:37:20 +02:00
Alexander "Ace" Olofsson
61d9729767
A final bit of script cleanup and caching
2016-08-29 00:29:30 +02:00
Alexander "Ace" Olofsson
6abc3c04bd
One letter wrong, oops
2016-08-28 23:26:02 +02:00
Alexander "Ace" Olofsson
d781846f53
Fix the /bigobj issue and some script cleanup
...
Surprisingly specific problem I must say, 32-bit vs2015 unity builds
2016-08-28 23:23:44 +02:00
Alexander "Ace" Olofsson
bc6aa86b8a
And escaping the printf input
2016-08-28 21:56:53 +02:00
Alexander "Ace" Olofsson
e47f4a9016
Missing STEP variable
2016-08-28 21:54:41 +02:00
Alexander "Ace" Olofsson
83de1f2de9
And use the correct OpenAL version
...
Should really have run these on a clean dir locally, but time
constraints...
2016-08-28 21:52:32 +02:00
Alexander "Ace" Olofsson
81a9258de9
Don't reset the APPVEYOR and CI variables
2016-08-28 21:48:00 +02:00
Alexander "Ace" Olofsson
dd5b6a46f5
Visual Studio 2015 support
2016-08-28 21:42:48 +02:00
Roman Proskuryakov
9d51e1966f
Rename SDL_SDK -> SDL2DIR as it is said in FindSDL2 documentation
2016-08-15 23:55:53 +03:00
Roman Proskuryakov
4cffdb67d8
Uses case-sensitive MyGUI_* variables
2016-08-15 15:59:02 +03:00
AnyOldName3
57640b8161
Improve the MSVC prebuild script to allow compiled binaries to be run directly with no further modification
2016-06-24 01:04:16 +01:00
Roman Proskuryakov
3bcd23022a
Rewrites FindBullet using LibFindMacros handling version properly
2016-05-31 07:18:37 +03:00
Roman Proskuryakov
f23b551bfa
Rename FFMPEG_SDK -> FFMPEG_HOME as it is said in wiki
...
Fix #942
2016-05-30 04:26:31 +03:00
Roman Proskuryakov
4821abc8af
Fixes MSVC CI for FFmpeg
2016-05-10 12:44:10 +03:00
Alexander "Ace" Olofsson
f422fe49f8
Slight improvement to the build setup
2015-12-24 18:27:57 +01:00
Alexander "Ace" Olofsson
c8145a1b91
Let's see if we can't get AppVeyor to work
2015-12-23 19:32:43 +01:00
Alexander "Ace" Olofsson
c226d015ac
AppVeyor doesn't pass the platform env variable?
2015-12-23 18:59:41 +01:00
Alexander "Ace" Olofsson
f3187b17c8
Update OpenAL soft link, get qtbinpatcher to run
2015-12-23 18:38:53 +01:00
Alexander "Ace" Olofsson
4ddb2feebb
Let's try building everything, see how far we get
2015-10-28 17:35:16 +01:00
Alexander "Ace" Olofsson
2e174fd1b5
Readd SDL2 main
2015-09-24 19:59:17 +02:00
Alexander "Ace" Olofsson
33175b44b8
Disable SDL main library
2015-09-24 16:02:03 +02:00
Alexander "Ace" Olofsson
fec08ef73e
Run unity build
2015-09-24 15:29:08 +02:00
Alexander "Ace" Olofsson
90af7060ea
Forgot an echo
2015-07-14 16:26:32 +02:00
Alexander "Ace" Olofsson
27a4af26ab
Cleaning up AppVeyor scripts
2015-07-12 02:41:31 +02:00
Alexander "Ace" Olofsson
a831e89a43
Fix MyGUI include dir, and properly return error codes
2015-07-07 16:21:56 +02:00
Alexander "Ace" Olofsson
f8485211a1
Fix merge issue
2015-07-07 15:54:03 +02:00
Alexander "Ace" Olofsson
0a47104c53
Merge branch 'appveyor' of github.com:ace13/openmw into appveyor
2015-07-07 15:52:23 +02:00
Alexander "Ace" Olofsson
ad47fb7b51
Fix build script
2015-07-07 15:50:40 +02:00
Alexander "Ace" Olofsson
24593d70ad
Merge remote-tracking branch 'upstream/appveyor' into appveyor-osg
2015-07-06 10:49:11 +02:00
Alexander "Ace" Olofsson
331d87d738
Bring over some more OSG changes to the Appveyor scripts, and properly use Qt
2015-06-25 19:19:04 +02:00
Alexander "Ace" Olofsson
b93cba9a69
Push messages properly
2015-06-25 18:16:59 +02:00
Alexander "Ace" Olofsson
9b09c7bbb0
Test the pre-existing Qt 5.4.1 install on Appveyor
2015-06-25 09:02:30 +02:00
Alexander "Ace" Olofsson
a1e29162bd
Bring Ogre pre-build script up to OSG standard
2015-06-24 15:54:00 +02:00
