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
