Commit Graph

104 Commits (test)

Author SHA1 Message Date
scrawl 9d07edda13 UnitTests: remove GMock which wasn't used anyway, and the gmock headers fail to compile together with gtest on ubuntu 14.04 10 years ago
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.
10 years ago
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.
10 years ago
cc9cii 69d0c7fd70 Cleanup leftover from previous osx support attempts. 10 years ago
cc9cii 5889fd5bd9 Try hard coding OSX paths. 10 years ago
cc9cii 142a825ad6 For OSX support. 10 years ago
cc9cii 6b9b02dc1a Giving up, revert CMake changes. 10 years ago
cc9cii 0171bde363 Another variation. 10 years ago
cc9cii c7e57e8d88 Another attempt for osx build. 10 years ago
cc9cii f29227629a Experimenting with FindOGRE for osx. 10 years ago
cc9cii f459adf117 Revert CMake changes (didn't work for osx anyway) 10 years ago
cc9cii 758ce0ed98 Various fixes as per feedback comments. 10 years ago
cc9cii 3aea1bf5f9 CMake changes for using Ogre Overlay. 10 years ago
cc9cii 862c5fc8f6 Add libavresample support. Tested on windows x64 only. 10 years ago
cc9cii c6cad5adc5 Make cmake more reliably detect libswresample 10 years ago
cc9cii 6138d0c982 Attempt to work around travis. 10 years ago
cc9cii 944f99b23a Initial commit of FLTP format binkaudio support. Converts to FLT format by manually interleaving decoded samples. swresample library is included with a view to use swr_convert() in future versions, but not used in this commit. 10 years ago
scrawl 1baf0f7bb2 Add version parsing to FindMyGUI.cmake 10 years ago
slothlife f6b2e7d5fd Fix building on Win32 11 years ago
root 3cd98e5259 fix code v5 10 years ago
root d8772156a7 fixe all code v 2 11 years ago
root 16aafc26bc fixed cmake for build on all plaforms include android 11 years ago
slothlife 20dabaead9 Fix CMake scripts to link static dependencies
Added FindDirectX scripts from Ogre so that FindOgre.cmake doesn't
fail silently to find the libraries correctly.

Modified top-level CMakelists.txt:
- Correctly set include dirs, preprocessor definitions, and add
  libraries for static Ogre plugins.
- Correctly set preprocessor definitions for static MyGUI.

Modified launcher, openmw, and opencs to link the static Ogre plugins.

Fixed FindSDL2.cmake to set a variable that contains only the SDL2
library, so that the launcher doesn't incorrectly link against
SDL2main.

Fixed FindMyGUI.cmake to correctly look for static variants.

Fixed FindOgre.cmake to set variables for DirectX plugins correctly.
11 years ago
Thoronador 320411f5b3 remove unused CMake files for Audiere, MPG123 and Sndfile 11 years ago
scrawl 79f32546e1 Dead link fix 11 years ago
scrawl 9089df3080 Add unity build option
Each component and each MW-subsystem will be used as a single compilation unit.
11 years ago
pvdk b43325119a Some changes to the version retrieval: ignore shallow clones 11 years ago
pvdk 85b7240948 Made the git version retrieval more reliable 11 years ago
scrawl ae5d25ac58 FindSDL.cmake is unused 11 years ago
scrawl fb0c5be536 Don't suppress git error output 11 years ago
pvdk 43bc223e68 Added version info retrieval from git tags 11 years ago
Scott Howard 2f082ef796 remove unneeded libraries 11 years ago
Bret Curtis 729ca1bfdd remove debug code 11 years ago
Bret Curtis 862f2f0883 added keywords for debian and switch to dyn libs in travis 11 years ago
Tom Mason 8d232aca35 changed libunshield filename to satisfy travis 12 years ago
Tom Mason 865a7c63df cmake for system libunshield 12 years ago
Bret Curtis 84a8ea4ef7 static sdl2 compilation option for Unixes that are not Apple 12 years ago
scrawl ab3634d692 Removed some remains of OIS 12 years ago
scrawl 495aeb5d3b Merge branch 'master' into HEAD
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/mwgui/cursorreplace.cpp
	apps/openmw/mwgui/cursorreplace.hpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwgui/windowmanagerimp.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	libs/openengine/ogre/renderer.cpp
12 years ago
Bret Curtis 40b6b4afc5 fix cmake typo that effects windows devs 12 years ago
Alexander "Ace" Olofsson d5aa975675 Fix some issues that seem to have appeared in the CMake configuration. 12 years ago
Nathan Jeffords 7ea1f6a02a fixes for using FFMPEG on windows 12 years ago
Michal Sciubidlo f7e5ea24f4 Merge branch 'startup' into cs_load.
Fix include in textinputdialog.cpp.
12 years ago
Marc Zinnschlag a002b253d1 silenced a cmake warning 12 years ago
Marc Zinnschlag a4872e3217 rewrote the opencs cmake scripts (more compact and no more annoying warnings) 12 years ago
Michal Sciubidlo f029a9011a Move datafilespage to shared space. 12 years ago
Jordan Milne 2639bc4383 Another temp fix for windows 12 years ago
Jordan Milne b6ec64485c fix includes for Windows 12 years ago
Jordan Milne 6449f68d61 Merge branch 'master' into sdl_input 12 years ago
Jordan Milne 884d3ea4d8 Rip out OIS, fill the holes with SDL goodness. WIP. 12 years ago