David Cernat
8686b9cc12
Merge pull request #29 from OpenMW/master
...
Add OpenMW commits from end of July
2016-08-04 00:56:36 +03:00
Koncord
1f0d6eba80
Fix FindRakNet
...
Added ws2_32 for Windows
Fixed path to headers
2016-08-02 18:41:50 +08:00
Aesylwinn
b4a000913c
Merge remote-tracking branch 'yar/master' into Even
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwdialogue/filter.cpp
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwworld/localscripts.cpp
# components/CMakeLists.txt
# components/compiler/exprparser.cpp
# components/sceneutil/workqueue.cpp
2016-07-17 23:50:52 -04:00
Koncord
1a32385632
Fix cmake modules
2016-07-12 20:37:39 +08:00
Koncord
1b259e2d33
Syncing inventory, animations, position, 8 key attributes
...
Created Package system
2016-07-07 23:50:48 +08:00
Koncord
1e29409dd5
Add OpenMW-mp target
2016-07-07 23:50:38 +08:00
Bret Curtis
ac8d347e9e
we have html output and autodoc functionality
2016-07-05 12:07:31 +02:00
Roman Proskuryakov
4d0544e61a
Adds FindTinyXML.cmake
2016-06-12 21:05:01 +03:00
Roman Proskuryakov
57b75d2cd1
Teaches LibFindMacros to find version from 'const int NAME = 42;'
2016-06-12 21:05:01 +03:00
Roman Proskuryakov
edb41b5b08
Rewrites FindLIBUNSHIELD using LibFindMacros
...
Renames LIBUNSHIELD_INCLUDE_DIR -> LIBUNSHIELD_INCLUDE_DIRS, LIBUNSHIELD_LIBRARY -> LIBUNSHIELD_LIBRARIES
2016-06-12 14:44:04 +03:00
Roman Proskuryakov
3bcd23022a
Rewrites FindBullet using LibFindMacros handling version properly
2016-05-31 07:18:37 +03:00
Roman Proskuryakov
280b20ccb7
Fix libfind_process for quiet packages
2016-05-31 07:18:36 +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
63ca8b73fc
fix: use Freetype in FindMYGUI instead of FREETYPE
2016-05-29 03:33:06 +03:00
Roman Proskuryakov
bd804d30a4
Rewrites FindFreetype using LibFindMacros
2016-05-11 08:47:03 +03:00
Roman Proskuryakov
da59ef0f67
Rewrites FindFFmpeg using LibFindMacros handling components properly
2016-05-10 12:43:54 +03:00
Roman Proskuryakov
81dd164006
Adds CMake module LibFindMacros to reduce pain in find modules
2016-05-09 23:35:33 +03:00
Roman Proskuryakov
16fbce91c2
Implements macro get_version_from_n_defines inside PreprocessorUtils
2016-05-09 23:35:33 +03:00
scrawl
9eb96b9cb6
Parse the bullet version in FindBullet.cmake
2016-02-15 14:34:59 +01:00
Hristos N. Triantafillou
97bcdf7904
Properly find MyGUI in /usr/local/lib
2016-01-16 16:42:54 -06:00
sandstranger
48f4fc34eb
build fixes for Android
2016-01-05 15:37:17 +03:00
sandstranger
bd5057aa3c
enable opengl es1
2015-12-02 22:40:04 +03:00
Nikolay Kasyanov
fff6b5fde1
OS X: remove custom bundle utilities, ones from CMake versions >= 3.1.0 are good enough
2015-11-14 13:50:01 +01:00
Sebastian Wick
b68f64ed97
adjust FindMyGUI.cmake to correctly handle REQUIRED and QUIETLY
2015-09-06 21:46:05 +02:00
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
