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
Bret Curtis
3ceb9116de
Give pwd -W a try
7 years ago
Bret Curtis
c4a4111b2e
Update before_script.msvc.sh
7 years ago
Bret Curtis
fb6ad9faec
try %TMP% ?
7 years ago
Bret Curtis
4ad3d66629
try using just ${TMP}
7 years ago
Bret Curtis
8be52d228e
Update before_script.msvc.sh
...
small fixes
7 years ago
Bret Curtis
60ec340fa3
remove toolset_real, use just toolset, do proper comparison
7 years ago
Bret Curtis
71314f0c3a
Use boost 1.67 instead of 1.61
7 years ago
Bret Curtis
46575d8de7
Update before_script.msvc.sh
...
1.61 -> 1.67
7 years ago
Bret Curtis
660193ae1b
Update before_script.msvc.sh
...
This has working GL Win10 MSVC updates, should be cross-compatible with appveyor.
7 years ago
Bret Curtis
1c4363eaa6
Using SYSTEMDRIVE because TEMP apparently means something different in bash then to windows cmd.
7 years ago
Bret Curtis
7bf502dd02
Bash it out!
7 years ago
Bret Curtis
1061270ac0
Try using @TEMP@ instead of hard coding it.
7 years ago
Bret Curtis
45d77372a0
with 260 char path fixed, this should work.
7 years ago
Bret Curtis
f17426cbcd
give boost 1.67 a spin with msvc 14.1
7 years ago
Bret Curtis
bd602847b5
fix broken QT 5.7.0 link
7 years ago
Bret Curtis
59a4251a6a
try to extract boost higher up in dir, then move.
7 years ago
Bret Curtis
b6fc204dd3
be more aggressive about suppressing message boxes
7 years ago
Bret Curtis
f7e1083ba4
get more output from boost
7 years ago
AnyOldName3
553094669b
Merge upstream/master (& fix merge conflicts)
7 years ago
Bret Curtis
937cbfa0a1
small commit to rigger AV
7 years ago
AnyOldName3
a1ab1dc7fe
Add easily understood error messages to the prebuild script instead of vague/silent failures.
7 years ago
Andrei Kortunov
de2513653e
AppVeyor: build with Release configuration
7 years ago
AnyOldName3
9ff31cc80d
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
7 years ago
Alexander "Ananace" Olofsson
d05de8e411
Give boost the correct toolset for 2017
7 years ago
Alexander "Ananace" Olofsson
3bd8dc3ef6
Use the right boost version for Appveyor
7 years ago
Alexander "Ananace" Olofsson
bcfa2a13a6
Use the VS2017 packaging of Qt5 for Appveyor
7 years ago
Alexander "Ananace" Olofsson
ea6c73333b
Bumping Qt to 5.10 for Appveyor
7 years ago
AnyOldName3
44b2cf2b7f
Merge upstream.
7 years ago
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
7 years ago
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
7 years ago
AnyOldName3
0e481a457e
Merge remote-tracking branch 'refs/remotes/upstream/master'
7 years ago
Alexander "Ace" Olofsson
50deed126b
Update SDL to 2.0.7
7 years ago
Alexander "Ace" Olofsson
04af200ae8
Downgrade MyGUI to 3.2.2 for Windows builds
7 years ago
AnyOldName3
ef8a7d1cb9
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
7 years ago
Alexander "Ace" Olofsson
32bdd500af
Updating OSG packages to 3.4.1
7 years ago
AnyOldName3
147455626e
Merge OpenMW/master
7 years ago
AnyOldName3
20607bdcd9
Actually add shadow DLL under Windows automatically for real this time
7 years ago
AnyOldName3
c2cd338086
Add shadow DLL under Windows automatically
7 years ago
AnyOldName3
f8fe992dc0
Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files
7 years ago
AnyOldName3
f50063402d
Adjust shaders to support shadows
7 years ago
PlutonicOverkill
0eb54fa96a
Remove TOOLSET and XP_TOOLSET
8 years ago
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.
8 years ago
Alexander "Ace" Olofsson
fd03c76e68
And apparently they're only doing zips now
8 years ago
Alexander "Ace" Olofsson
ae05c37a46
Update Windows CI scripts to use ffmpeg 3.2.4
8 years ago
Alexander "Ace" Olofsson
cda83559aa
Update Bullet to 2.86
8 years ago
Alexander "Ace" Olofsson
123e57a65c
Include the OpenAL32.dll file into builds
8 years ago
Alexander "Ace" Olofsson
bcaf160eab
Add some missing Qt DLLs
8 years ago
Alexander "Ace" Olofsson
c93f7b90c5
Disable the version changing on AppVeyor
...
Apparently it breaks the build detail links on GitHub, not really
acceptable that.
8 years ago
Alexander "Ace" Olofsson
61d9729767
A final bit of script cleanup and caching
8 years ago
Alexander "Ace" Olofsson
6abc3c04bd
One letter wrong, oops
8 years ago
Alexander "Ace" Olofsson
d781846f53
Fix the /bigobj issue and some script cleanup
...
Surprisingly specific problem I must say, 32-bit vs2015 unity builds
8 years ago
Alexander "Ace" Olofsson
bc6aa86b8a
And escaping the printf input
8 years ago
Alexander "Ace" Olofsson
e47f4a9016
Missing STEP variable
8 years ago
Alexander "Ace" Olofsson
83de1f2de9
And use the correct OpenAL version
...
Should really have run these on a clean dir locally, but time
constraints...
8 years ago
Alexander "Ace" Olofsson
81a9258de9
Don't reset the APPVEYOR and CI variables
8 years ago
Alexander "Ace" Olofsson
dd5b6a46f5
Visual Studio 2015 support
8 years ago
Roman Proskuryakov
9d51e1966f
Rename SDL_SDK -> SDL2DIR as it is said in FindSDL2 documentation
9 years ago
Roman Proskuryakov
4cffdb67d8
Uses case-sensitive MyGUI_* variables
9 years ago
AnyOldName3
57640b8161
Improve the MSVC prebuild script to allow compiled binaries to be run directly with no further modification
9 years ago
Roman Proskuryakov
3bcd23022a
Rewrites FindBullet using LibFindMacros handling version properly
9 years ago
Roman Proskuryakov
f23b551bfa
Rename FFMPEG_SDK -> FFMPEG_HOME as it is said in wiki
...
Fix #942
9 years ago
Roman Proskuryakov
4821abc8af
Fixes MSVC CI for FFmpeg
9 years ago
Alexander "Ace" Olofsson
f422fe49f8
Slight improvement to the build setup
9 years ago
Alexander "Ace" Olofsson
c8145a1b91
Let's see if we can't get AppVeyor to work
9 years ago
Alexander "Ace" Olofsson
c226d015ac
AppVeyor doesn't pass the platform env variable?
9 years ago
Alexander "Ace" Olofsson
f3187b17c8
Update OpenAL soft link, get qtbinpatcher to run
9 years ago
Alexander "Ace" Olofsson
4ddb2feebb
Let's try building everything, see how far we get
9 years ago
Alexander "Ace" Olofsson
2e174fd1b5
Readd SDL2 main
9 years ago
Alexander "Ace" Olofsson
33175b44b8
Disable SDL main library
9 years ago
Alexander "Ace" Olofsson
fec08ef73e
Run unity build
9 years ago
Alexander "Ace" Olofsson
90af7060ea
Forgot an echo
10 years ago
Alexander "Ace" Olofsson
27a4af26ab
Cleaning up AppVeyor scripts
10 years ago
Alexander "Ace" Olofsson
a831e89a43
Fix MyGUI include dir, and properly return error codes
10 years ago
Alexander "Ace" Olofsson
f8485211a1
Fix merge issue
10 years ago
Alexander "Ace" Olofsson
0a47104c53
Merge branch 'appveyor' of github.com:ace13/openmw into appveyor
10 years ago
Alexander "Ace" Olofsson
ad47fb7b51
Fix build script
10 years ago
Alexander "Ace" Olofsson
24593d70ad
Merge remote-tracking branch 'upstream/appveyor' into appveyor-osg
10 years ago
Alexander "Ace" Olofsson
331d87d738
Bring over some more OSG changes to the Appveyor scripts, and properly use Qt
10 years ago
Alexander "Ace" Olofsson
b93cba9a69
Push messages properly
10 years ago
Alexander "Ace" Olofsson
9b09c7bbb0
Test the pre-existing Qt 5.4.1 install on Appveyor
10 years ago
Alexander "Ace" Olofsson
a1e29162bd
Bring Ogre pre-build script up to OSG standard
10 years ago