David Cernat
e0234dc362
Merge pull request #183 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
2017-03-13 18:20:07 +02:00
Nikolay Kasyanov
7f429f26e1
Allow getting available version information even when clone is shallow
2017-03-07 21:53:49 +01:00
David Cernat
fb34e2c4ba
Revert "[Build] Fix for MSYS2 build while maintaining MSVC fix"
...
This reverts commit faf1c416f3
2017-02-23 02:29:25 +02:00
Battlerax
faf1c416f3
[Build] Fix for MSYS2 build while maintaining MSVC fix
2017-02-22 16:22:05 -06:00
Battlerax
b47260f9dc
[Build] Fixed linker issue
2017-02-22 15:49:46 -06:00
David Cernat
213bc1e733
Print correct variable for Terra's library
2017-01-12 13:46:17 +02:00
David Cernat
10a0f165dd
Print paths used for server dependencies in CMake, change tabs to spaces
2017-01-12 13:45:04 +02:00
Koncord
cbae39412a
Fix RakNet module
2017-01-03 19:07:42 +08:00
U-VirtualBox-PC\Admin
6229269506
Some patches for lua on windows
2016-12-16 19:04:47 +03:00
David Cernat
436548413e
Resolve conflicts in pull request #39
...
# Conflicts:
# CMakeLists.txt
2016-08-18 15:10:52 +03:00
scrawl
b26478b860
Merge pull request #1028 from kpp/find_osg_plugins
...
Find osg_plugins
2016-08-16 17:05:44 +02:00
scrawl
ec14fe4d4c
Merge pull request #1026 from kpp/find_sphinx
...
Fix FindSphinx.cmake
2016-08-16 16:49:43 +02:00
Roman Proskuryakov
0d83121a6f
Removes unused FindPkgMacros
2016-08-16 06:06:30 +03:00
Roman Proskuryakov
95dc1258d6
Rewrites find_package for OpenSceneGraph plugins using LibFindMacros and osg_find_library
2016-08-16 06:06:30 +03:00
Roman Proskuryakov
ed2c2170f0
Rewrites FindSDL2 using LibFindMacros
2016-08-15 23:57:39 +03:00
Roman Proskuryakov
3df57b1833
Fixes LibFindMacros for libfind_process
2016-08-15 23:55:53 +03:00
Roman Proskuryakov
2311969f05
Reduce the number of copypaste in FindSphinx.cmake
2016-08-15 22:29:07 +03:00
David Cernat
d9cfd5bac2
Resolve conflicts with OpenMW
2016-08-15 19:14:13 +03:00
scrawl
a44ba0e461
Merge pull request #966 from kpp/find_mygui
...
Find mygui
2016-08-15 16:36:48 +02:00
Roman Proskuryakov
e0e69a8d8a
Rewrites FindMyGUI with LibFindMacros
2016-08-15 15:59:02 +03:00
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
39963a2c85
Removes PreprocessorUtils.cmake
...
Replaces get_version_from_n_defines -> libfind_version_n_header
2016-06-28 13:03:16 +03: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
