Commit Graph

201 Commits (c058dce346330e22dcc90e7f92aded73565850c3)

Author SHA1 Message Date
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
7 years ago
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
7 years ago
Koncord 533cd9cdec [General] Fix FindRakNet 7 years ago
Koncord 470ea50b54 [General] Use LuaJit instead default Lua 7 years ago
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
7 years ago
Koncord 62877f38b7 [General] Remove Terra support
Use LuaJIT instead.
7 years ago
Cédric 7cafec9861 Add support for msvc with cmake version pre 3.9 (fixes #4429) 7 years ago
David Cernat 365f485e8d Merge pull request #397 from OpenMW/master while resolving conflicts
Conflicts:
	components/CMakeLists.txt
7 years ago
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 7 years ago
David Cernat b7c6261e16 Merge pull request #392 from OpenMW/master while resolving conflicts
# Conflicts:
#	README.md
7 years ago
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
7 years ago
David Cernat 656453725b
Merge pull request #343 from OpenMW/master
Add OpenMW commits up to 23 Nov 2017
7 years ago
jbo-85 f896c9acb6 Fix search paths in FindSDL2.cmake to find SDL2 built from source 7 years ago
David Cernat 37304655da Merge pull request #326 from OpenMW/master
Add OpenMW commits up to 25 Oct 2017
7 years ago
AnyOldName3 daf7d8451c Switch to a more reliable method of passing the git-version targt the data it needs 7 years ago
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
7 years ago
AnyOldName3 a52c485090 Fix list length error 7 years ago
AnyOldName3 6af8ad70a5 Remove superfluous copy_all_files macro 7 years ago
AnyOldName3 76c4ff983a Fix getting cmake property as variable 7 years ago
AnyOldName3 1f86fa3c31 Fix resource copying on non-MSVC targets 7 years ago
AnyOldName3 b00b94f0db Use CMAKE_CONFIGURATION_TYPES instead of manually listing the possible configuration types. 7 years ago
AnyOldName3 f9a3562ccd Remove duplicate macro definition and fix warning 7 years ago
AnyOldName3 5ceaaabeb2 Remove MESSAGE calls I accidentally left in 7 years ago
AnyOldName3 f8fe992dc0 Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files 7 years ago
David Cernat bd541b1e5b Merge pull request #287 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
7 years ago
AnyOldName3 afbdc27a34 Move calls to cmake_minimum_required as early in the CMake process as possible. 7 years ago
AnyOldName3 de14e43680 Seemingly fix everything by setting policies that were unset upon entering the macro 7 years ago
AnyOldName3 33c77d7a2a Try using cmake_parse_arguments to make the macro work 7 years ago
krizd c9f099ce07 Change CMake version check to include 3.8 7 years ago
AnyOldName3 5ce34f1cbf Move new behaviour into macro to reduce code duplication 7 years ago
Koncord b847914d6f [General] Fix finding CallFF includes 8 years ago
Koncord 1c09e0c255 [Server] Add CallFF dependency 8 years ago
Koncord 9506f9ca35 [General] Allow luajit-2.1 8 years ago
Koncord 2d91c60a11 [General] Change "Lib" to "lib" in FindRakNet cmake module 8 years ago
Koncord 056ec2d434 [General] Fix CMake errors 8 years ago
Koncord a27815fa7d [General] Allow backslashes in add_component_dir to specify subgroups 8 years ago
Koncord 505905ab7d [General] Allow backslashes in add_openmw_dir to specify subgroups 8 years ago
David Cernat 1d83098619 [Build] Use slilghtly retooled version of CMake's default FindLua51 8 years ago
David Cernat e0234dc362 Merge pull request #183 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
8 years ago
Nikolay Kasyanov 7f429f26e1 Allow getting available version information even when clone is shallow 8 years ago
David Cernat fb34e2c4ba Revert "[Build] Fix for MSYS2 build while maintaining MSVC fix"
This reverts commit faf1c416f3.
8 years ago
Battlerax faf1c416f3 [Build] Fix for MSYS2 build while maintaining MSVC fix 8 years ago
Battlerax b47260f9dc [Build] Fixed linker issue 8 years ago
David Cernat 213bc1e733 Print correct variable for Terra's library 8 years ago
David Cernat 10a0f165dd Print paths used for server dependencies in CMake, change tabs to spaces 8 years ago
Koncord cbae39412a Fix RakNet module 8 years ago
U-VirtualBox-PC\Admin 6229269506 Some patches for lua on windows 8 years ago
David Cernat 436548413e Resolve conflicts in pull request #39
# Conflicts:
#	CMakeLists.txt
8 years ago
scrawl b26478b860 Merge pull request #1028 from kpp/find_osg_plugins
Find osg_plugins
8 years ago
scrawl ec14fe4d4c Merge pull request #1026 from kpp/find_sphinx
Fix FindSphinx.cmake
8 years ago