Commit Graph

201 Commits (cb82318c36f411391021570906241cb7f6fa56c3)

Author SHA1 Message Date
Roman Proskuryakov 0d83121a6f Removes unused FindPkgMacros 8 years ago
Roman Proskuryakov 95dc1258d6 Rewrites find_package for OpenSceneGraph plugins using LibFindMacros and osg_find_library 8 years ago
Roman Proskuryakov ed2c2170f0 Rewrites FindSDL2 using LibFindMacros 8 years ago
Roman Proskuryakov 3df57b1833 Fixes LibFindMacros for libfind_process 8 years ago
Roman Proskuryakov 2311969f05 Reduce the number of copypaste in FindSphinx.cmake 8 years ago
David Cernat d9cfd5bac2 Resolve conflicts with OpenMW 8 years ago
scrawl a44ba0e461 Merge pull request #966 from kpp/find_mygui
Find mygui
8 years ago
Roman Proskuryakov e0e69a8d8a Rewrites FindMyGUI with LibFindMacros 8 years ago
David Cernat 8686b9cc12 Merge pull request #29 from OpenMW/master
Add OpenMW commits from end of July
9 years ago
Koncord 1f0d6eba80 Fix FindRakNet
Added ws2_32 for Windows
Fixed path to headers
9 years ago
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
9 years ago
Koncord 1a32385632 Fix cmake modules 9 years ago
Koncord 1b259e2d33 Syncing inventory, animations, position, 8 key attributes
Created Package system
9 years ago
Koncord 1e29409dd5 Add OpenMW-mp target 9 years ago
Bret Curtis ac8d347e9e we have html output and autodoc functionality 9 years ago
Roman Proskuryakov 39963a2c85 Removes PreprocessorUtils.cmake
Replaces get_version_from_n_defines -> libfind_version_n_header
9 years ago
Roman Proskuryakov 4d0544e61a Adds FindTinyXML.cmake 9 years ago
Roman Proskuryakov 57b75d2cd1 Teaches LibFindMacros to find version from 'const int NAME = 42;' 9 years ago
Roman Proskuryakov edb41b5b08 Rewrites FindLIBUNSHIELD using LibFindMacros
Renames LIBUNSHIELD_INCLUDE_DIR -> LIBUNSHIELD_INCLUDE_DIRS, LIBUNSHIELD_LIBRARY -> LIBUNSHIELD_LIBRARIES
9 years ago
Roman Proskuryakov 3bcd23022a Rewrites FindBullet using LibFindMacros handling version properly 9 years ago
Roman Proskuryakov 280b20ccb7 Fix libfind_process for quiet packages 9 years ago
Roman Proskuryakov f23b551bfa Rename FFMPEG_SDK -> FFMPEG_HOME as it is said in wiki
Fix #942
9 years ago
Roman Proskuryakov 63ca8b73fc fix: use Freetype in FindMYGUI instead of FREETYPE 9 years ago
Roman Proskuryakov bd804d30a4 Rewrites FindFreetype using LibFindMacros 9 years ago
Roman Proskuryakov da59ef0f67 Rewrites FindFFmpeg using LibFindMacros handling components properly 9 years ago
Roman Proskuryakov 81dd164006 Adds CMake module LibFindMacros to reduce pain in find modules 9 years ago
Roman Proskuryakov 16fbce91c2 Implements macro get_version_from_n_defines inside PreprocessorUtils 9 years ago
scrawl 9eb96b9cb6 Parse the bullet version in FindBullet.cmake 9 years ago
Hristos N. Triantafillou 97bcdf7904 Properly find MyGUI in /usr/local/lib 9 years ago
sandstranger 48f4fc34eb build fixes for Android 9 years ago
sandstranger bd5057aa3c enable opengl es1 9 years ago
Nikolay Kasyanov fff6b5fde1 OS X: remove custom bundle utilities, ones from CMake versions >= 3.1.0 are good enough 9 years ago
Sebastian Wick b68f64ed97 adjust FindMyGUI.cmake to correctly handle REQUIRED and QUIETLY 9 years ago
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.
10 years ago
Nikolay Kasyanov 5fba7400a6 Borrow modified bundle utilities from https://github.com/Slicer/Slicer
They support dependencies with @rpath
10 years ago
Marc Zinnschlag b3ad983f1f Merge remote-tracking branch 'scrawl/version'
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
10 years ago
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.
10 years ago
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).
10 years ago
scrawl 71509d2497 Remove cmake script Ogre leftovers 10 years ago
scrawl 4bb3cbf0fb Remove last remains of Ogre 10 years ago
scrawl 4f0387bdb5 Fix for recent merge 10 years ago
scrawl 974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
10 years ago
scrawl b75d993da4 Fix for BULLET_DYNAMICS_LIBRARY cmake leftover 10 years ago
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).
10 years ago
k1ll 31db37afd4 FindMygui mingw 10 years ago
scrawl 48a6d7c1a0 Remove mygui platform libraries from cmake 10 years ago
scrawl 4e69e7cc0f OpenMW compiles and runs w/o render window 10 years ago
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
scrawl f1b138d0a8 Merge branch 'master' into videoplayback
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
12 years ago
scrawl 35f4d09288 swscale handled better (cmake) 12 years ago
Nathan Jeffords 008d6d6589 added additional library search paths to find bullet
This allowed CMake to correctly build Visual Studio 2010 project files against a windows compiled version of bullet (2.81 rev 2613)
12 years ago