mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 13:49:56 +00:00
Code Issues Releases Wiki Activity
28718 commits 38 branches 54 tags 122 MiB
Commit graph

253 commits

Author SHA1 Message Date
AnyOldName3
9067731a96 Adapt to CMake 3.13's new meaning of OSGDB_LIBRARY (i.e. that it can now be a list) while allowing for the possibility that the found libraries may be in different directories when debug and optimised versions exist. 2018-12-13 02:08:35 +00:00
elsid
ef631a0961
Add dependency for GMock 2018-08-11 16:52:53 +03:00
David Cernat
6cb5ac6e63 Merge pull request #457 from OpenMW/master while resolving conflicts 
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/main.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwmechanics/character.cpp
	components/CMakeLists.txt
 2018-07-14 03:57:05 +03:00
Doc West
467989cdd5 Moved crashcatcher to a component and also use it in CS 
Reworked debugger detection (failed on gdb 7.11), it now uses /proc to detect the debugger
 2018-07-09 16:25:55 +02:00
Koncord
533cd9cdec [General] Fix FindRakNet 2018-07-05 19:49:33 +08:00
Koncord
470ea50b54 [General] Use LuaJit instead default Lua 2018-07-05 19:21:53 +08:00
David Cernat
a236ffc4be Merge pull request #456 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	README.md
#	apps/openmw/mwgui/quickkeysmenu.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/combat.cpp
 2018-07-04 01:52:29 +03:00
Koncord
62877f38b7 [General] Remove Terra support 
Use LuaJIT instead.
 2018-07-02 23:07:09 +08:00
Cédric
7cafec9861 Add support for msvc with cmake version pre 3.9 (fixes #4429) 2018-06-08 06:34:40 +02:00
David Cernat
365f485e8d Merge pull request #397 from OpenMW/master while resolving conflicts 
Conflicts:
	components/CMakeLists.txt
 2018-03-30 10:28:52 +03:00
bret curtis
4890ecd357 remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb 2018-03-27 20:20:40 +02:00
David Cernat
b7c6261e16 Merge pull request #392 from OpenMW/master while resolving conflicts 
# Conflicts:
#	README.md
 2018-03-09 21:07:46 +02:00
Harald H
d3b623b5d3 http to https for supported urls (#1625) 
* http to https for supported urls

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http tp https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* some url fixes

* http to https
 2018-03-08 21:23:24 +01:00
David Cernat
656453725b
Merge pull request #343 from OpenMW/master 
Add OpenMW commits up to 23 Nov 2017
 2017-11-23 04:51:13 +02:00
jbo-85
f896c9acb6 Fix search paths in FindSDL2.cmake to find SDL2 built from source 2017-11-19 11:56:24 +01:00
David Cernat
37304655da Merge pull request #326 from OpenMW/master 
Add OpenMW commits up to 25 Oct 2017
 2017-10-26 17:28:56 +03:00
AnyOldName3
daf7d8451c Switch to a more reliable method of passing the git-version targt the data it needs 2017-10-24 23:29:18 +01:00
David Cernat
e164e6305e Merge pull request #313 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
 2017-10-16 07:37:29 +03:00
AnyOldName3
a52c485090 Fix list length error 2017-10-12 18:16:10 +01:00
AnyOldName3
6af8ad70a5 Remove superfluous copy_all_files macro 2017-10-12 17:50:20 +01:00
AnyOldName3
76c4ff983a Fix getting cmake property as variable 2017-10-12 17:17:25 +01:00
AnyOldName3
1f86fa3c31 Fix resource copying on non-MSVC targets 2017-10-12 17:09:01 +01:00
AnyOldName3
b00b94f0db Use CMAKE_CONFIGURATION_TYPES instead of manually listing the possible configuration types. 2017-10-12 15:40:37 +01:00
AnyOldName3
f9a3562ccd Remove duplicate macro definition and fix warning 2017-10-12 02:45:50 +01:00
AnyOldName3
5ceaaabeb2 Remove MESSAGE calls I accidentally left in 2017-10-11 22:08:49 +01:00
AnyOldName3
f8fe992dc0 Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files 2017-10-11 21:58:55 +01:00
David Cernat
bd541b1e5b Merge pull request #287 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
 2017-09-12 07:38:49 +03:00
AnyOldName3
afbdc27a34 Move calls to cmake_minimum_required as early in the CMake process as possible. 2017-09-10 18:30:10 +01:00
AnyOldName3
de14e43680 Seemingly fix everything by setting policies that were unset upon entering the macro 2017-09-10 03:18:22 +01:00
AnyOldName3
33c77d7a2a Try using cmake_parse_arguments to make the macro work 2017-09-09 17:22:55 +01:00
krizd
c9f099ce07 Change CMake version check to include 3.8 2017-09-09 03:06:03 +01:00
AnyOldName3
5ce34f1cbf Move new behaviour into macro to reduce code duplication 2017-09-08 22:17:42 +01:00
Koncord
b847914d6f [General] Fix finding CallFF includes 2017-07-04 01:15:11 +08:00
Koncord
1c09e0c255 [Server] Add CallFF dependency 2017-06-30 17:58:41 +08:00
Koncord
9506f9ca35 [General] Allow luajit-2.1 2017-06-30 04:00:43 +08:00
Koncord
2d91c60a11 [General] Change "Lib" to "lib" in FindRakNet cmake module 2017-06-15 13:07:13 +08:00
Koncord
056ec2d434 [General] Fix CMake errors 2017-05-25 23:56:22 +08:00
Koncord
a27815fa7d [General] Allow backslashes in add_component_dir to specify subgroups 2017-04-22 13:56:03 +08:00
Koncord
505905ab7d [General] Allow backslashes in add_openmw_dir to specify subgroups 2017-04-18 16:49:21 +08:00
David Cernat
1d83098619 [Build] Use slilghtly retooled version of CMake's default FindLua51 2017-03-24 07:29:04 +02:00
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
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