Commit Graph

209 Commits (0.7.0)

Author SHA1 Message Date
Nikolay Kasyanov 224fcc9a4a [macOS, CI] Fix dependency installation 7 years ago
David Cernat 93bd3207db Merge pull request #212 from OpenMW/master
Add OpenMW commits up to 6 May 2017
7 years ago
Alexander "Ace" Olofsson fd03c76e68 And apparently they're only doing zips now 7 years ago
Alexander "Ace" Olofsson ae05c37a46 Update Windows CI scripts to use ffmpeg 3.2.4 7 years ago
David Cernat e0234dc362 Merge pull request #183 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
7 years ago
Nikolay Kasyanov e24cb0fe5d [macOS, CI] Configure deployment of nightly builds to FTP 7 years ago
Nikolay Kasyanov 57c5ecfba8 [macOS, CI] Use most recent prebuilt dependencies 7 years ago
Nikolay Kasyanov f1abc5d7cb [macOS, CI] Use Release configuration 7 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
7 years ago
Alexander "Ace" Olofsson cda83559aa Update Bullet to 2.86 7 years ago
Koncord 316e5fa22e [CI] Disable Browser 7 years ago
David Cernat dfb87e9e0d Merge pull request #124 from OpenMW/master
Add OpenMW commits up to 11 Jan
7 years ago
Nikolay Kasyanov 7bd95c8ce3 [macOS] Use https link to download dependencies on CI 7 years ago
Nikolay Kasyanov 07423f973f [macOS] Use newer prebuilt dependencies on CI 7 years ago
David Cernat 5bdfb72752 Merge pull request #116 from OpenMW/master
Add OpenMW changes up to 26 Dec
7 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
Roman Proskuryakov 4cffdb67d8 Uses case-sensitive MyGUI_* variables 8 years ago
Nikolay Kasyanov bf0ec550da OS X: specify minimum CMake version & remove redundant argument from CI script 8 years ago
AnyOldName3 57640b8161 Improve the MSVC prebuild script to allow compiled binaries to be run directly with no further modification 8 years ago
Roman Proskuryakov 3bcd23022a Rewrites FindBullet using LibFindMacros handling version properly 8 years ago
Roman Proskuryakov f23b551bfa Rename FFMPEG_SDK -> FFMPEG_HOME as it is said in wiki
Fix #942
8 years ago
Roman Proskuryakov 4821abc8af Fixes MSVC CI for FFmpeg 8 years ago
Nikolay Kasyanov 697b809c79 Reactivate OS X CI 8 years ago
scrawl 63665104bf Remove optimization build flags on Travis-CI to speed up the build 8 years ago
Alexander "Ace" Olofsson b3e985fca2 Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor 8 years ago
Bret Curtis 10609ca5d1 how much memory in our vm? 8 years ago
Bret Curtis 339fbe23a7 remove precise cruft 8 years ago
Alexander "Ace" Olofsson f422fe49f8 Slight improvement to the build setup 9 years ago
Alexander "Ace" Olofsson fe241be26c Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor 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
Bret Curtis 9d5e7b34c6 use ffmpeg from our repo 9 years ago
Bret Curtis 1e8eddc5b4 another try 9 years ago
Bret Curtis bdfd1c217b try using precise ffmpeg library instead of libav 9 years ago
scrawl 6bf3932279 Fix the check_tabs.sh script choking on QT generated UI files when doing an in-source build 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 ead82742cd Merge branch 'unity-fixes' into appveyor 9 years ago
scrawl ab97a90c76 Add travis-ci script to detect tab characters in the code 9 years ago
Alexander "Ace" Olofsson 90af7060ea Forgot an echo 9 years ago
Alexander "Ace" Olofsson 27a4af26ab Cleaning up AppVeyor scripts 9 years ago
Scott Howard 3a0293480e Update boost in travis-ci to fix build failure 9 years ago
Alexander "Ace" Olofsson a831e89a43 Fix MyGUI include dir, and properly return error codes 9 years ago
Alexander "Ace" Olofsson f8485211a1 Fix merge issue 9 years ago
Alexander "Ace" Olofsson 0a47104c53 Merge branch 'appveyor' of github.com:ace13/openmw into appveyor 9 years ago
Alexander "Ace" Olofsson ad47fb7b51 Fix build script 9 years ago
Alexander "Ace" Olofsson 4319255d7b Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor 9 years ago
Alexander "Ace" Olofsson 24593d70ad Merge remote-tracking branch 'upstream/appveyor' into appveyor-osg 9 years ago
Alexander "Ace" Olofsson 331d87d738 Bring over some more OSG changes to the Appveyor scripts, and properly use Qt 9 years ago
Alexander "Ace" Olofsson b93cba9a69 Push messages properly 9 years ago
Alexander "Ace" Olofsson 9b09c7bbb0 Test the pre-existing Qt 5.4.1 install on Appveyor 9 years ago
Alexander "Ace" Olofsson a1e29162bd Bring Ogre pre-build script up to OSG standard 9 years ago
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
9 years ago
Alexander "Ace" Olofsson 4f2cd17119 Let's get some OSG builds going 9 years ago
Alexander "Ace" Olofsson c40f59179f Merge remote-tracking branch 'scrawl/osg' into appveyor-osg 9 years ago
scrawl 30053140a1 Add cmake-data workaround to travis script 9 years ago
scrawl 7fe86a7fe0 Adjust travis config -ogre, -boost_wave, +osg 9 years ago
Alexander "Ace" Olofsson e49cf2888d Let's disable everything except OpenMW itself
Just to check if it's at all possible to use AppVeyor
9 years ago
Alexander "Ace" Olofsson 3425e9b1d1 And done.
Switched to a slight less shallow clone too, for better versioning
9 years ago
Alexander "Ace" Olofsson 108c2719a8 And yet I forgot about msbuild, should work now 9 years ago
Alexander "Ace" Olofsson 20b7c7b46c Hopefully the last fixes, build should run 9 years ago
Alexander "Ace" Olofsson ba9b21bc29 Moving dependencies to a better place 9 years ago
Alexander "Ace" Olofsson 0a1454d5ec Final fixes, moving to Appveyor unstable for boost 9 years ago
Alexander "Ace" Olofsson 6993fbaece And yet more issues slip past 9 years ago
Alexander "Ace" Olofsson d7494128a2 More script fixes 9 years ago
Alexander "Ace" Olofsson cd4042109a Fix the script issues 9 years ago
Alexander "Ace" Olofsson 956234cde9 Add preliminary appveyor data 9 years ago
Scott Howard 154bb04a77 add scan-build to travis matrix 9 years ago
Nikolay Kasyanov 6b0ca73352 CI: use Qt from our homebrew tap 9 years ago
Nikolay Kasyanov 2fa39c4581 Do not install formulae that are already present on Travis instances, let's check if that would make Travis happy 10 years ago
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.
10 years ago