Commit Graph

201 Commits (fix/skillcap)

Author SHA1 Message Date
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
scrawl c49966dd29 started over 12 years ago
scrawl d432420a32 fix FindFFmpeg.cmake 12 years ago
Lukasz Gromanowski 34513cf16b Added support for code coverage checking and unittests.
Added support for code coverage checking with gcov and
unittests with Google C++ unittest and GMock frameworks.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Michael Mc Donnell 18fd14ff75 Workaround for FindMyGUI.cmake path space bug on Windows.
See bug 353 http://bugs.openmw.org/issues/353
13 years ago
scrawl 17a5c22c8f don't use globbing 13 years ago
scrawl 4ea6530772 hello world. 13 years ago
Sylvain THESNIERES 7354d1eccb CMake fixes:
- Fix environment variable in Bullet
- Remove spurious message in MyGUI
13 years ago
Nikolay Kasyanov 677a907528 fixed comment 13 years ago
Nikolay Kasyanov 1b5d327f7e Fixed OS X build with static MyGUI 13 years ago
k1ll f2c4e513a4 Add support for building with a static build of the MyGui Libraries. 13 years ago
Roman Melnik ef2f7e841a Merge branch 'master' of github.com:Kromgart/openmw 13 years ago
Marc Zinnschlag 6c8be7205a build fix 13 years ago
Alexander "Ace" Olofsson 55f1053b4f Windows fixes for compiling and linking 13 years ago
Roman Melnik 978b5f64d8 Merge cmake/findBullet patch for '_debug' postfixed libraries
Merge in the patch from the cmake official repository:
https://cmake.org/gitweb?p=cmake.git;a=commit;h=6f935d7f55af5c96d18d23b72991e87d1e029dda

Without this fix cmake couldn't find bullet's debug libraries,
and VS2010 openmw project file was generated with links to
release libraries instead (which caused errors during build
in debug configuration).
13 years ago
scrawl 66baf9ec81 Merge branch 'master' into mygui 13 years ago
k1ll 5abaf1fee2 Check if searching OGRE dir with version suffix failed. I'm not sure if this is the right way to do it though. 13 years ago
k1ll 1f76f37531 Adds search for plugins in OGRE dirs with version suffix and a workaround for a strange problem with set to FindOgre.cmake. 13 years ago
scrawl 3a00fbb950 removed mygui from source tree and use system install instead 13 years ago
k1ll 7d81422c27 Better fix for the Framework problem. 13 years ago
k1ll c5bbbee9c1 Added needed cmake files and added a comment to clarify the changes in FindOgre.cmake 13 years ago
k1ll b7eb7ff8e3 Added support for linking static Ogre libraries and plugins into the launcher and openmw. 13 years ago
Marc Zinnschlag be70d197e5 Merge branch 'next'
Conflicts:
	.gitignore
	cmake/FindOGRE.cmake
13 years ago
Alexander "Ace" Olofsson bfb3a4a36b Changed FindOGRE a bit to make it easier to find a source build of Ogre. (At least on windows) 13 years ago
Pieter van der Kloet 7bf8497215 Fixed CMake problem with Ogre plugins path 13 years ago
Pieter van der Kloet efe3a3fcbe Merge branch 'master' of https://github.com/zinnschlag/openmw into cmakeogre 13 years ago
Pieter van der Kloet c255c519e4 Replaced FindOGRE.cmake, this one looks for debug libraries too 13 years ago
Marc Zinnschlag 61dd1922b0 more specific cmake source file GLOBing 13 years ago
Pieter van der Kloet ea241d85ef Fixed some issues with the CMake files 13 years ago
Marc Zinnschlag cb1373a4c7 rewrote cmake scripts for components 13 years ago
Alexander "Ace" Olofsson 255f948bae A small fix to add all the files and not just the first one CMake finds 13 years ago
Marc Zinnschlag dc878e2c30 testing MSVC fix, another try 13 years ago
Marc Zinnschlag 77d1f1f8a1 testing MSVC fix 13 years ago
Marc Zinnschlag ad086312b8 testing: cmake script simplification 13 years ago
Nikolay Kasyanov eaea48011d Now working mac app bundle generated during build
(includes plugins & resources).
Still need to copy frameworks before deployment.
FindOGRE.cmake finds Ogre plugins dir on OS X.
Default OS X data path set to the data subdir
near .app.
README_Mac updated.
14 years ago
Marc Zinnschlag 8b2252e7a1 first attempt at building with bullet 14 years ago
Jan-Peter Nilsson 753a4f681e Search for plugins in orgre lib directory 14 years ago
Diggory Hardy 39614c6813 CMake configuration tweaks
Make the PkgConfig search for OGRE libraries and headers happy when custom paths are set.
Check the uuid/uuid.h header is found.
14 years ago
Nicolay Korslund f55362cbdc Some Windows-help to cmake/FindAudiere.cmake + non-important changes. 15 years ago
Nicolay Korslund 358e1ca5a5 Added custom UTF8 converter. Removed iconv dependency. 15 years ago
Armin Preiml 6a936100a7 Merge remote branch 'upstream/master' 15 years ago
Nicolay Korslund 08289158d7 Added support for WAV files with libsndfile 15 years ago
Nicolay Korslund 912c8b1f2d Added mpg123 file reader 15 years ago
Nicolay Korslund cad9712411 Implemented FFMpeg sound loading. Selecting sound library is controlled through the CMake file. 15 years ago
Nicolay Korslund 34572f0b19 Compiled and linked in sound system (not yet functional) 15 years ago
Armin Preiml 305563e595 disabled char encoding method for windows, although you'll need to add the iconv libs 15 years ago
Armin Preiml d81820303d Added cmake file for the iconv library and extended relevant
cmake files to use it.
Added convertToUTF8 to esm_reader. getString(int size) uses this
method now.
15 years ago
Nicolay Korslund fdb41f0774 Merged in CMake and header cleanups from zinnschlag 15 years ago
Marc Zinnschlag c4a6fa56ea cmake modifications for out of source build 15 years ago
Nicolay Korslund 4c1d07adb6 Added missing CMake files. 15 years ago
Ardekantur 0de198980c initial commit of mac build 15 years ago
Nicolay Korslund 7238847b8b CMake for Windows-patch by Sylvain T (NOT YET TESTED). Includes update to Mangle.
Details:
- create a sub directory to store CMake scripts (later more to come)
- add a search Ogre package script (may be replaced later by "official" Ogre 1.7 search script, since they switched to CMake, yeah !)
- fixed header issues being not available with MSVC and replaced by equivalent functions if assumed portable enough
15 years ago