Commit Graph

208 Commits (8f90f8a3b8696a2cc92860d825d2f87dcb498465)

Author SHA1 Message Date
Bret Curtis ae4cb0c3ee no need for macos_qt_formula since on osx there is no more qt4, just qt5 7 years ago
Nikolay Kasyanov 90ccf5b42b [macOS, CI] Build using macOS 10.13 SDK 7 years ago
David Cernat 2a3c74bfcc Merge pull request #447 from OpenMW/master while resolving conflicts
# Conflicts:
#	README.md
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
David Cernat c20a0c72c5 Merge pull request #442 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
7 years ago
Bret Curtis d73c6ebe60
Merge pull request #1721 from akortunov/appveyor
AppVeyor: build with Release configuration
7 years ago
Andrei Kortunov de2513653e AppVeyor: build with Release configuration 7 years ago
David Cernat 669d4d3d7e
Merge pull request #440 from OpenMW/master
Add OpenMW commits up to 27 May 2018
7 years ago
Nikolay Kasyanov ba3a02ad05 [macOS, CI] Do not upload a nightly if there's already one of the same commit 7 years ago
David Cernat 815d17d9db
Merge pull request #433 from OpenMW/master
Add OpenMW commits up to 21 May 2018
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
Kyle Cooley cf5bd0dca7 Travis: use qt5, newer boost libraries, callff, gcc/clang builds... 7 years ago
David Cernat 365f485e8d Merge pull request #397 from OpenMW/master while resolving conflicts
Conflicts:
	components/CMakeLists.txt
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
David Cernat b7c6261e16 Merge pull request #392 from OpenMW/master while resolving conflicts
# Conflicts:
#	README.md
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
David Cernat 07f0cc2b0e
Merge pull request #353 from OpenMW/master
Add OpenMW commits up to 4 Dec 2017
7 years ago
Alexander "Ace" Olofsson 50deed126b
Update SDL to 2.0.7 7 years ago
David Cernat e7f20e7daf Merge pull request #351 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
#	README.md
7 years ago
Alexander "Ace" Olofsson 04af200ae8 Downgrade MyGUI to 3.2.2 for Windows builds 7 years ago
David Cernat 37304655da Merge pull request #326 from OpenMW/master
Add OpenMW commits up to 25 Oct 2017
7 years ago
Alexander "Ace" Olofsson 32bdd500af Updating OSG packages to 3.4.1 7 years ago
David Cernat e164e6305e Merge pull request #313 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
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
David Cernat 38247ff086 Merge pull request #303 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwbase/dialoguemanager.hpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
#	apps/openmw/mwgui/container.cpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
7 years ago
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
7 years ago
David Cernat 721b218cc2 Merge pull request #258 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	README.md
8 years ago
Nikolay Kasyanov ffcdedced3 [macOS, CI] Use FTP URL from environment
This URL is also subject to change, moving to Travis settings.
8 years ago
David Cernat bfbf1bbac4 Merge pull request #247 from OpenMW/master
Add OpenMW commits up to 26 Jul 2017
8 years ago
scrawl c23b75ab9a Merge pull request #1339 from PlutonicOverkill/vs2017-support
Add Visual Studio 2017 support (Feature #3952)
8 years ago
David Cernat 2c1ece79fc Merge pull request #245 from OpenMW/master
Add OpenMW commits up to 22 Jul 2017
8 years ago
Nikolay Kasyanov 411b78562e [macOS, CI] Use most recent dependencies
Includes a fix for https://bugs.openmw.org/issues/3904.
8 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
David Cernat df67ae4689 Merge pull request #229 from OpenMW/master
Add OpenMW commits up to 20 Jun 2017
8 years ago
tlmullis fad760cc1d msbuild was always defaulting to building the Debug configuration so it was impossible to build any other configurations with build.msvc.sh 8 years ago
David Cernat fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp
8 years ago
Nikolay Kasyanov 016da1f10c [macOS, CI] Use most recent dependencies 8 years ago
Nikolay Kasyanov dd882b69c6 [macOS, CI] Use Release configuration 8 years ago
Nikolay Kasyanov 071419db4a [macOS, CI] Enable OpenCS build and see what happens 8 years ago
Nikolay Kasyanov c16506d07c [OS X, CI] Use Xcode 8/macOS 10.12 SDK 8 years ago
Nikolay Kasyanov 6260e15852 [OS X] Temporarily disable OpenCS build on CI 8 years ago
Nikolay Kasyanov 231908d9cf [OS X, CI] Use dependencies build against libc++ 8 years ago
Bret Curtis b6ee76b77b Switch to latest Qt5 version which is C++11-compatible 8 years ago
David Cernat 315ec46ff6 Merge pull request #224 from OpenMW/master
Add OpenMW commits up to 3 Jun 2017
8 years ago
Nikolay Kasyanov 224fcc9a4a [macOS, CI] Fix dependency installation 8 years ago
David Cernat 93bd3207db Merge pull request #212 from OpenMW/master
Add OpenMW commits up to 6 May 2017
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
David Cernat e0234dc362 Merge pull request #183 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
8 years ago
Nikolay Kasyanov e24cb0fe5d [macOS, CI] Configure deployment of nightly builds to FTP 8 years ago
Nikolay Kasyanov 57c5ecfba8 [macOS, CI] Use most recent prebuilt dependencies 8 years ago
Nikolay Kasyanov f1abc5d7cb [macOS, CI] Use Release configuration 8 years ago
David Cernat 6763718412 Merge pull request #146 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/actors.cpp
8 years ago
Alexander "Ace" Olofsson cda83559aa Update Bullet to 2.86 8 years ago
Koncord 316e5fa22e [CI] Disable Browser 8 years ago
David Cernat dfb87e9e0d Merge pull request #124 from OpenMW/master
Add OpenMW commits up to 11 Jan
8 years ago
Nikolay Kasyanov 7bd95c8ce3 [macOS] Use https link to download dependencies on CI 8 years ago
Nikolay Kasyanov 07423f973f [macOS] Use newer prebuilt dependencies on CI 8 years ago
David Cernat 5bdfb72752 Merge pull request #116 from OpenMW/master
Add OpenMW changes up to 26 Dec
8 years ago
Nikolay Kasyanov a0990e5899 [macOS] Switch CI to Xcode 8.2 8 years ago
David Cernat bf0a96d552 Merge pull request #114 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
8 years ago
Nikolay Kasyanov 37c8a36dd8 [macOS] Parametrize Qt5 version used on CI 8 years ago
Nikolay Kasyanov 6d8d9e5dbc [macOS] Take Qt prefix path from Homebrew for CI resilience
Recent CI failure was caused by path changed by Homebrew.
8 years ago
David Cernat ec211e58d0 Merge pull request #98 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/CMakeLists.txt
8 years ago
Nikolay Kasyanov 3adf4cb97f Link OpenMW with libz on macOS 8 years ago
Nikolay Kasyanov 0115a3a874 Revert "Link OpenMW with libz on macOS"
This reverts commit 0c4dd05118.
8 years ago
Nikolay Kasyanov 0c4dd05118 Link OpenMW with libz on macOS 8 years ago
David Cernat 4d72e7ce37 Merge pull request #91 from OpenMW/master
Add OpenMW commits up to 31 Oct
8 years ago
Nikolay Kasyanov cf2e59c983 [OS X] Use Qt 5.5 on CI
Newer Qt versions require C++11.
8 years ago
David Cernat 3b7693c719 Resolve conflicts in pull request #55
# Conflicts:
#	README.md
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/combat.cpp
8 years ago
Koncord e5e9c90441 Travis: disable build server for clang 8 years ago
Koncord 485a1b1e3b Disable OS X in Travis CI 8 years ago
Koncord 9abd4e5a16 Fail :D 8 years ago
Koncord b2f1bb06f2 fix travis 2 8 years ago
Koncord 9a4edff122 Disable unnecessary builds 8 years ago
Koncord 31c372a0e7 resolve depends for travis 8 years ago
Alexander "Ace" Olofsson 123e57a65c Include the OpenAL32.dll file into builds 8 years ago
scrawl 20da3bc240 Merge pull request #1037 from ace13/appveyor
Visual Studio 2015 support
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
Allofich c89293770f Link Clang paths 8 years ago
scrawl b26478b860 Merge pull request #1028 from kpp/find_osg_plugins
Find osg_plugins
8 years ago
Roman Proskuryakov 95dc1258d6 Rewrites find_package for OpenSceneGraph plugins using LibFindMacros and osg_find_library 8 years ago
Roman Proskuryakov 9d51e1966f Rename SDL_SDK -> SDL2DIR as it is said in FindSDL2 documentation 8 years ago
scrawl dae4a8353a Merge pull request #1024 from kpp/kpp_travis_improvements
Improve Travis config
8 years ago
Roman Proskuryakov f4f81a14c9 Use Travis addons.apt.packages to install packages 8 years ago
scrawl a44ba0e461 Merge pull request #966 from kpp/find_mygui
Find mygui
8 years ago