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
tlmullis
fad760cc1d
msbuild was always defaulting to building the Debug configuration so it was impossible to build any other configurations with build.msvc.sh
2017-06-19 06:00:42 -07:00
Nikolay Kasyanov
016da1f10c
[macOS, CI] Use most recent dependencies
2017-06-13 08:44:55 +02:00
Nikolay Kasyanov
dd882b69c6
[macOS, CI] Use Release configuration
2017-06-09 16:49:25 +02:00
Nikolay Kasyanov
071419db4a
[macOS, CI] Enable OpenCS build and see what happens
2017-06-09 16:49:25 +02:00
Nikolay Kasyanov
c16506d07c
[OS X, CI] Use Xcode 8/macOS 10.12 SDK
2017-06-09 16:49:25 +02:00
Nikolay Kasyanov
6260e15852
[OS X] Temporarily disable OpenCS build on CI
2017-06-09 16:49:25 +02:00
Nikolay Kasyanov
231908d9cf
[OS X, CI] Use dependencies build against libc++
2017-06-09 16:49:25 +02:00
Bret Curtis
b6ee76b77b
Switch to latest Qt5 version which is C++11-compatible
2017-06-09 16:49:25 +02:00
Nikolay Kasyanov
224fcc9a4a
[macOS, CI] Fix dependency installation
2017-06-03 10:42:49 +02: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
Nikolay Kasyanov
e24cb0fe5d
[macOS, CI] Configure deployment of nightly builds to FTP
2017-03-07 21:53:49 +01:00
Nikolay Kasyanov
57c5ecfba8
[macOS, CI] Use most recent prebuilt dependencies
2017-03-05 23:01:16 +01:00
Nikolay Kasyanov
f1abc5d7cb
[macOS, CI] Use Release configuration
2017-03-05 23:01:16 +01:00
Alexander "Ace" Olofsson
cda83559aa
Update Bullet to 2.86
2017-02-10 11:37:36 +01:00
Nikolay Kasyanov
7bd95c8ce3
[macOS] Use https link to download dependencies on CI
2017-01-05 14:06:52 +03:00
Nikolay Kasyanov
07423f973f
[macOS] Use newer prebuilt dependencies on CI
2017-01-05 14:02:10 +03:00
Nikolay Kasyanov
a0990e5899
[macOS] Switch CI to Xcode 8.2
2016-12-24 16:05:24 +01:00
Nikolay Kasyanov
37c8a36dd8
[macOS] Parametrize Qt5 version used on CI
2016-12-18 18:22:43 +01:00
Nikolay Kasyanov
6d8d9e5dbc
[macOS] Take Qt prefix path from Homebrew for CI resilience
...
Recent CI failure was caused by path changed by Homebrew.
2016-12-18 18:22:43 +01:00
Nikolay Kasyanov
3adf4cb97f
Link OpenMW with libz on macOS
2016-11-05 12:18:22 +01:00
Nikolay Kasyanov
0115a3a874
Revert "Link OpenMW with libz on macOS"
...
This reverts commit 0c4dd05118
2016-11-05 12:11:04 +01:00
Nikolay Kasyanov
0c4dd05118
Link OpenMW with libz on macOS
2016-11-05 12:09:47 +01:00
Nikolay Kasyanov
cf2e59c983
[OS X] Use Qt 5.5 on CI
...
Newer Qt versions require C++11.
2016-10-30 21:36:43 +01:00
Alexander "Ace" Olofsson
123e57a65c
Include the OpenAL32.dll file into builds
2016-09-02 06:57:36 +02:00
scrawl
20da3bc240
Merge pull request #1037 from ace13/appveyor
...
Visual Studio 2015 support
2016-08-29 12:40:09 +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
