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
|
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 |
|
Nikolay Kasyanov
|
697b809c79
|
Reactivate OS X CI
|
9 years ago |
|
scrawl
|
63665104bf
|
Remove optimization build flags on Travis-CI to speed up the build
|
9 years ago |
|
Alexander "Ace" Olofsson
|
b3e985fca2
|
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
|
9 years ago |
Bret Curtis
|
10609ca5d1
|
how much memory in our vm?
|
9 years ago |
|
Bret Curtis
|
339fbe23a7
|
remove precise cruft
|
9 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 |