Nikolay Kasyanov
c868010c20
OS X: don't consider libs from /usr/local as "system dependencies" during packaging
...
Otherwise they won't be moved into final application bundle.
2015-08-10 23:15:31 +02:00
Nikolay Kasyanov
5fba7400a6
Borrow modified bundle utilities from https://github.com/Slicer/Slicer
...
They support dependencies with @rpath
2015-08-10 23:15:31 +02:00
Marc Zinnschlag
b3ad983f1f
Merge remote-tracking branch 'scrawl/version'
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
2015-07-18 12:22:37 +02:00
scrawl
f09e4620b6
Move OpenMW version information to a textfile instead of compiling it in
...
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
2015-07-18 03:09:04 +02:00
slothlife
83ef1f7eea
Add support for linking OpenSceneGraph statically
...
Added some basic support for linking to OpenSceneGraph and its plugins
statically. Also added a library necessary to statically link MyGUI
(previously Ogre pulled it in).
2015-07-17 00:56:15 -05:00
scrawl
71509d2497
Remove cmake script Ogre leftovers
2015-06-04 15:59:24 +02:00
scrawl
4bb3cbf0fb
Remove last remains of Ogre
2015-06-03 23:04:35 +02:00
scrawl
4f0387bdb5
Fix for recent merge
2015-06-03 18:34:47 +02:00
scrawl
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
2015-06-03 03:18:29 +02:00
scrawl
b75d993da4
Fix for BULLET_DYNAMICS_LIBRARY cmake leftover
2015-05-29 14:25:47 +02:00
scrawl
1f00174c02
Use a btCollisionWorld instead of btDiscreteDynamicsWorld
...
Slightly improves performance, since we no longer need to stepSimulation(). We don't use any Dynamics (yet).
2015-05-27 23:09:38 +02:00
k1ll
31db37afd4
FindMygui mingw
2015-04-29 18:31:28 +02:00
scrawl
48a6d7c1a0
Remove mygui platform libraries from cmake
2015-04-28 16:33:30 +02:00
scrawl
4e69e7cc0f
OpenMW compiles and runs w/o render window
2015-04-01 17:02:15 +02:00
scrawl
9d07edda13
UnitTests: remove GMock which wasn't used anyway, and the gmock headers fail to compile together with gtest on ubuntu 14.04
2015-01-09 20:53:43 +01:00
Marco Schulze
3024c67995
Regenerate components/version/version.hpp as HEAD moves on a git checkout
...
Pull request #416 introduced a common bug where version.hpp wouldn't be
regenerated every build, poteantially leading to stale version data. This
commit adds a custom build target, git-version, which updates version.hpp
before the components library is built.
2014-12-30 18:37:33 -03:00
Marco Schulze
d92cd2ffad
Remove GetGitRevisionDescription.cmake
...
GetGitRevisionDescription.cmake uses a somewhat contrived method to obtain the
hash of the commit pointed by the repository's HEAD. This method fails on
unusual, but still valid repository layouts.
This commit removes cmake/GetGitRevisionDescription.cmake{,.in}, replacing its
functionality with direct use of Git's plumbing.
2014-12-27 00:26:35 -03:00
cc9cii
69d0c7fd70
Cleanup leftover from previous osx support attempts.
2014-10-25 10:40:33 +11:00
cc9cii
5889fd5bd9
Try hard coding OSX paths.
2014-10-15 16:42:05 +11:00
cc9cii
142a825ad6
For OSX support.
2014-10-15 09:51:20 +11:00
cc9cii
6b9b02dc1a
Giving up, revert CMake changes.
2014-10-13 19:31:38 +11:00
cc9cii
0171bde363
Another variation.
2014-10-13 19:15:17 +11:00
cc9cii
c7e57e8d88
Another attempt for osx build.
2014-10-13 18:59:15 +11:00
cc9cii
f29227629a
Experimenting with FindOGRE for osx.
2014-10-13 18:55:30 +11:00
cc9cii
f459adf117
Revert CMake changes (didn't work for osx anyway)
2014-10-12 22:30:08 +11:00
cc9cii
758ce0ed98
Various fixes as per feedback comments.
2014-10-12 21:15:50 +11:00
cc9cii
3aea1bf5f9
CMake changes for using Ogre Overlay.
2014-10-04 05:48:56 +10:00
cc9cii
862c5fc8f6
Add libavresample support. Tested on windows x64 only.
2014-09-11 16:47:00 +10:00
cc9cii
c6cad5adc5
Make cmake more reliably detect libswresample
2014-09-04 18:55:10 +10:00
cc9cii
6138d0c982
Attempt to work around travis.
2014-09-01 22:09:07 +10:00
cc9cii
944f99b23a
Initial commit of FLTP format binkaudio support. Converts to FLT format by manually interleaving decoded samples. swresample library is included with a view to use swr_convert() in future versions, but not used in this commit.
2014-08-31 13:20:33 +10:00
scrawl
1baf0f7bb2
Add version parsing to FindMyGUI.cmake
2014-08-26 16:56:04 +02:00
slothlife
f6b2e7d5fd
Fix building on Win32
2014-08-10 18:28:38 -05:00
root
3cd98e5259
fix code v5
2014-09-06 02:02:39 +04:00
root
d8772156a7
fixe all code v 2
2014-08-06 00:46:21 +04:00
root
16aafc26bc
fixed cmake for build on all plaforms include android
2014-08-04 19:49:54 +04:00
slothlife
20dabaead9
Fix CMake scripts to link static dependencies
...
Added FindDirectX scripts from Ogre so that FindOgre.cmake doesn't
fail silently to find the libraries correctly.
Modified top-level CMakelists.txt:
- Correctly set include dirs, preprocessor definitions, and add
libraries for static Ogre plugins.
- Correctly set preprocessor definitions for static MyGUI.
Modified launcher, openmw, and opencs to link the static Ogre plugins.
Fixed FindSDL2.cmake to set a variable that contains only the SDL2
library, so that the launcher doesn't incorrectly link against
SDL2main.
Fixed FindMyGUI.cmake to correctly look for static variants.
Fixed FindOgre.cmake to set variables for DirectX plugins correctly.
2014-06-02 02:51:04 -05:00
Thoronador
320411f5b3
remove unused CMake files for Audiere, MPG123 and Sndfile
2014-05-03 21:05:45 +02:00
scrawl
79f32546e1
Dead link fix
2014-04-20 19:28:25 +02:00
scrawl
9089df3080
Add unity build option
...
Each component and each MW-subsystem will be used as a single compilation unit.
2014-03-16 23:49:12 +01:00
pvdk
b43325119a
Some changes to the version retrieval: ignore shallow clones
2014-02-19 14:19:08 +01:00
pvdk
85b7240948
Made the git version retrieval more reliable
2014-02-19 13:43:14 +01:00
scrawl
ae5d25ac58
FindSDL.cmake is unused
2014-02-19 11:23:03 +01:00
scrawl
fb0c5be536
Don't suppress git error output
2014-02-13 10:13:03 +01:00
pvdk
43bc223e68
Added version info retrieval from git tags
2014-01-22 17:04:49 +01:00
Scott Howard
2f082ef796
remove unneeded libraries
2013-12-29 16:25:49 -05:00
Bret Curtis
729ca1bfdd
remove debug code
2013-11-20 10:18:49 +01:00
Bret Curtis
862f2f0883
added keywords for debian and switch to dyn libs in travis
2013-11-20 10:16:51 +01:00
Tom Mason
8d232aca35
changed libunshield filename to satisfy travis
2013-08-19 20:48:20 +01:00
Tom Mason
865a7c63df
cmake for system libunshield
2013-08-19 20:20:00 +01:00
