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
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
Allofich
c89293770f
Link Clang paths
2016-08-28 21:25:09 +09:00
scrawl
b26478b860
Merge pull request #1028 from kpp/find_osg_plugins
...
Find osg_plugins
2016-08-16 17:05:44 +02:00
Roman Proskuryakov
95dc1258d6
Rewrites find_package for OpenSceneGraph plugins using LibFindMacros and osg_find_library
2016-08-16 06:06:30 +03:00
Roman Proskuryakov
9d51e1966f
Rename SDL_SDK -> SDL2DIR as it is said in FindSDL2 documentation
2016-08-15 23:55:53 +03:00
scrawl
dae4a8353a
Merge pull request #1024 from kpp/kpp_travis_improvements
...
Improve Travis config
2016-08-15 20:05:33 +02:00
Roman Proskuryakov
f4f81a14c9
Use Travis addons.apt.packages to install packages
2016-08-15 18:45:29 +03:00
scrawl
a44ba0e461
Merge pull request #966 from kpp/find_mygui
...
Find mygui
2016-08-15 16:36:48 +02:00
Roman Proskuryakov
4cffdb67d8
Uses case-sensitive MyGUI_* variables
2016-08-15 15:59:02 +03:00
Nikolay Kasyanov
bf0ec550da
OS X: specify minimum CMake version & remove redundant argument from CI script
2016-07-07 01:09:59 +02: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
Nikolay Kasyanov
697b809c79
Reactivate OS X CI
2016-03-06 16:09:10 +01:00
scrawl
63665104bf
Remove optimization build flags on Travis-CI to speed up the build
2016-02-16 18:19:17 +01:00
Alexander "Ace" Olofsson
b3e985fca2
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
2016-01-30 07:31:00 +01:00
Bret Curtis
10609ca5d1
how much memory in our vm?
2016-01-21 09:22:42 +01:00
Bret Curtis
339fbe23a7
remove precise cruft
2016-01-20 14:03:51 +01:00
Alexander "Ace" Olofsson
f422fe49f8
Slight improvement to the build setup
2015-12-24 18:27:57 +01:00
Alexander "Ace" Olofsson
fe241be26c
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
2015-12-24 11:27:02 +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
Bret Curtis
9d5e7b34c6
use ffmpeg from our repo
2015-11-12 16:39:29 +01:00
Bret Curtis
1e8eddc5b4
another try
2015-11-12 16:39:29 +01:00
Bret Curtis
bdfd1c217b
try using precise ffmpeg library instead of libav
2015-11-12 16:39:29 +01:00
scrawl
6bf3932279
Fix the check_tabs.sh script choking on QT generated UI files when doing an in-source build
2015-11-04 20:25:03 +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
ead82742cd
Merge branch 'unity-fixes' into appveyor
2015-09-24 15:22:51 +02:00
scrawl
ab97a90c76
Add travis-ci script to detect tab characters in the code
2015-09-17 00:18:00 +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
Scott Howard
3a0293480e
Update boost in travis-ci to fix build failure
2015-07-09 15:32:15 -04: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
4319255d7b
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
2015-07-07 15:35:43 +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
Alexander "Ace" Olofsson
c71bbd02bf
Finish up the OSG build scripts and configuration
...
Sadly it seems like Appveyor can't build OpenMW without timing out yet.
More build-time improvements are in order
2015-06-08 15:49:29 +02:00
Alexander "Ace" Olofsson
4f2cd17119
Let's get some OSG builds going
2015-06-08 02:14:20 +02:00
Alexander "Ace" Olofsson
c40f59179f
Merge remote-tracking branch 'scrawl/osg' into appveyor-osg
2015-06-08 02:02:39 +02:00
scrawl
30053140a1
Add cmake-data workaround to travis script
2015-06-04 16:56:13 +02:00
scrawl
7fe86a7fe0
Adjust travis config -ogre, -boost_wave, +osg
2015-06-04 00:08:28 +02:00
Alexander "Ace" Olofsson
e49cf2888d
Let's disable everything except OpenMW itself
...
Just to check if it's at all possible to use AppVeyor
2015-06-03 10:15:28 +02:00
Alexander "Ace" Olofsson
3425e9b1d1
And done.
...
Switched to a slight less shallow clone too, for better versioning
2015-06-03 02:34:45 +02:00
Alexander "Ace" Olofsson
108c2719a8
And yet I forgot about msbuild, should work now
2015-06-03 02:04:31 +02:00
Alexander "Ace" Olofsson
20b7c7b46c
Hopefully the last fixes, build should run
2015-06-03 01:41:45 +02:00
Alexander "Ace" Olofsson
ba9b21bc29
Moving dependencies to a better place
2015-06-03 01:18:10 +02:00
Alexander "Ace" Olofsson
0a1454d5ec
Final fixes, moving to Appveyor unstable for boost
2015-06-03 00:51:22 +02:00
Alexander "Ace" Olofsson
6993fbaece
And yet more issues slip past
2015-06-02 23:52:34 +02:00
Alexander "Ace" Olofsson
d7494128a2
More script fixes
2015-06-02 23:50:52 +02:00
Alexander "Ace" Olofsson
cd4042109a
Fix the script issues
2015-06-02 23:29:47 +02:00
Alexander "Ace" Olofsson
956234cde9
Add preliminary appveyor data
2015-06-02 23:11:09 +02:00
Scott Howard
154bb04a77
add scan-build to travis matrix
2015-03-20 22:55:56 -04:00
Nikolay Kasyanov
6b0ca73352
CI: use Qt from our homebrew tap
2015-02-11 10:04:00 +02:00
Nikolay Kasyanov
2fa39c4581
Do not install formulae that are already present on Travis instances, let's check if that would make Travis happy
2014-12-25 14:22:27 +03:00
Nikolay Kasyanov
8b2b54d89a
Travis CI: enable OS X build
...
Refactor platform-specific calls from .travis.yml to separate .sh scripts.
Test suite still needs to be enabled & tested for OS X though.
2014-10-05 19:31:43 +04:00
