mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 15:19:55 +00:00
Code Issues Releases Wiki Activity
24861 commits 38 branches 54 tags 122 MiB
Commit graph

184 commits

Author SHA1 Message Date
root
d8772156a7 fixe all code v 2 2014-08-06 00:46:21 +04:00
root
16aafc26bc fixed cmake for build on all plaforms include android 2014-08-04 19:49:54 +04:00
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.
 2014-06-02 02:51:04 -05:00
Thoronador
320411f5b3 remove unused CMake files for Audiere, MPG123 and Sndfile 2014-05-03 21:05:45 +02:00
scrawl
79f32546e1 Dead link fix 2014-04-20 19:28:25 +02:00
scrawl
9089df3080 Add unity build option 
Each component and each MW-subsystem will be used as a single compilation unit.
 2014-03-16 23:49:12 +01:00
pvdk
b43325119a Some changes to the version retrieval: ignore shallow clones 2014-02-19 14:19:08 +01:00
pvdk
85b7240948 Made the git version retrieval more reliable 2014-02-19 13:43:14 +01:00
scrawl
ae5d25ac58 FindSDL.cmake is unused 2014-02-19 11:23:03 +01:00
scrawl
fb0c5be536 Don't suppress git error output 2014-02-13 10:13:03 +01:00
pvdk
43bc223e68 Added version info retrieval from git tags 2014-01-22 17:04:49 +01:00
Scott Howard
2f082ef796 remove unneeded libraries 2013-12-29 16:25:49 -05:00
Bret Curtis
729ca1bfdd remove debug code 2013-11-20 10:18:49 +01:00
Bret Curtis
862f2f0883 added keywords for debian and switch to dyn libs in travis 2013-11-20 10:16:51 +01:00
Tom Mason
8d232aca35 changed libunshield filename to satisfy travis 2013-08-19 20:48:20 +01:00
Tom Mason
865a7c63df cmake for system libunshield 2013-08-19 20:20:00 +01:00
Bret Curtis
84a8ea4ef7 static sdl2 compilation option for Unixes that are not Apple 2013-06-18 14:31:47 +02:00
scrawl
ab3634d692 Removed some remains of OIS 2013-06-12 20:13:19 +02:00
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
 2013-06-12 12:34:33 +02:00
Bret Curtis
40b6b4afc5 fix cmake typo that effects windows devs 2013-03-08 11:31:52 +01:00
Alexander "Ace" Olofsson
d5aa975675 Fix some issues that seem to have appeared in the CMake configuration. 2013-02-27 23:44:20 +01:00
Nathan Jeffords
7ea1f6a02a fixes for using FFMPEG on windows 2013-02-24 09:42:08 -08:00
Michal Sciubidlo
f7e5ea24f4 Merge branch 'startup' into cs_load. 
Fix include in textinputdialog.cpp.
 2013-02-05 21:23:49 +01:00
Marc Zinnschlag
a002b253d1 silenced a cmake warning 2013-02-03 16:18:17 +01:00
Marc Zinnschlag
a4872e3217 rewrote the opencs cmake scripts (more compact and no more annoying warnings) 2013-02-03 13:30:40 +01:00
Michal Sciubidlo
f029a9011a Move datafilespage to shared space. 2013-01-30 20:21:03 +01:00
Jordan Milne
2639bc4383 Another temp fix for windows 2013-01-12 18:53:00 -04:00
Jordan Milne
b6ec64485c fix includes for Windows 2013-01-12 17:52:26 -04:00
Jordan Milne
6449f68d61 Merge branch 'master' into sdl_input 2013-01-08 06:24:31 -04:00
Jordan Milne
884d3ea4d8 Rip out OIS, fill the holes with SDL goodness. WIP. 2013-01-08 06:19:05 -04:00
scrawl
f1b138d0a8 Merge branch 'master' into videoplayback 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2013-01-07 13:25:15 +01:00
scrawl
35f4d09288 swscale handled better (cmake) 2013-01-07 13:06:16 +01:00
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)
 2013-01-01 10:57:58 -08:00
scrawl
c49966dd29 started over 2012-12-11 22:49:31 +01:00
scrawl
d432420a32 fix FindFFmpeg.cmake 2012-12-01 20:53:28 +01:00
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>
 2012-08-19 22:23:46 +03:00
Michael Mc Donnell
18fd14ff75 Workaround for FindMyGUI.cmake path space bug on Windows. 
See bug 353 http://bugs.openmw.org/issues/353
 2012-08-01 11:45:29 -04:00
scrawl
17a5c22c8f don't use globbing 2012-07-20 23:31:49 +02:00
scrawl
4ea6530772 hello world. 2012-07-04 00:26:57 +02:00
Sylvain THESNIERES
7354d1eccb CMake fixes: 
- Fix environment variable in Bullet
- Remove spurious message in MyGUI
 2012-06-08 19:54:12 +02:00
Nikolay Kasyanov
677a907528 fixed comment 2012-04-15 21:37:33 +02:00
Nikolay Kasyanov
1b5d327f7e Fixed OS X build with static MyGUI 2012-04-15 19:02:27 +02:00
k1ll
f2c4e513a4 Add support for building with a static build of the MyGui Libraries. 2012-04-05 13:01:09 +02:00
Roman Melnik
ef2f7e841a Merge branch 'master' of github.com:Kromgart/openmw 2012-03-28 23:08:39 +03:00
Marc Zinnschlag
6c8be7205a build fix 2012-03-27 20:13:48 +02:00
Alexander "Ace" Olofsson
55f1053b4f Windows fixes for compiling and linking 2012-03-27 00:36:53 +02:00
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).
 2012-03-25 23:53:14 +03:00
scrawl
66baf9ec81 Merge branch 'master' into mygui 2012-03-20 20:02:30 +01:00
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. 2012-03-19 15:04:55 +01:00
k1ll
1f76f37531 Adds search for plugins in OGRE dirs with version suffix and a workaround for a strange problem with set to FindOgre.cmake. 2012-03-19 14:25:33 +01:00
scrawl
3a00fbb950 removed mygui from source tree and use system install instead 2012-03-18 15:11:37 +01:00
k1ll
7d81422c27 Better fix for the Framework problem. 2012-03-16 19:17:10 +01:00
k1ll
c5bbbee9c1 Added needed cmake files and added a comment to clarify the changes in FindOgre.cmake 2012-03-15 21:37:55 +01:00
k1ll
b7eb7ff8e3 Added support for linking static Ogre libraries and plugins into the launcher and openmw. 2012-03-15 15:51:39 +01:00
Marc Zinnschlag
be70d197e5 Merge branch 'next' 
Conflicts:
	.gitignore
	cmake/FindOGRE.cmake
 2012-03-02 12:11:44 +01:00
Alexander "Ace" Olofsson
bfb3a4a36b Changed FindOGRE a bit to make it easier to find a source build of Ogre. (At least on windows) 2012-02-27 22:22:17 +01:00
Pieter van der Kloet
7bf8497215 Fixed CMake problem with Ogre plugins path 2012-02-07 21:41:08 +01:00
Pieter van der Kloet
efe3a3fcbe Merge branch 'master' of https://github.com/zinnschlag/openmw into cmakeogre 2012-02-07 21:38:16 +01:00
Pieter van der Kloet
c255c519e4 Replaced FindOGRE.cmake, this one looks for debug libraries too 2012-01-31 21:10:40 +01:00
Marc Zinnschlag
61dd1922b0 more specific cmake source file GLOBing 2012-01-28 14:16:25 +01:00
Pieter van der Kloet
ea241d85ef Fixed some issues with the CMake files 2012-01-28 01:36:17 +01:00
Marc Zinnschlag
cb1373a4c7 rewrote cmake scripts for components 2011-11-06 09:30:15 +01:00
Alexander "Ace" Olofsson
255f948bae A small fix to add all the files and not just the first one CMake finds 2011-10-30 18:43:27 +01:00
Marc Zinnschlag
dc878e2c30 testing MSVC fix, another try 2011-10-22 22:40:31 +02:00
Marc Zinnschlag
77d1f1f8a1 testing MSVC fix 2011-10-22 16:46:28 +02:00
Marc Zinnschlag
ad086312b8 testing: cmake script simplification 2011-10-22 13:55:06 +02:00
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.
 2011-04-28 21:55:05 +02:00
Marc Zinnschlag
8b2252e7a1 first attempt at building with bullet 2011-01-30 13:19:41 +01:00
Jan-Peter Nilsson
753a4f681e Search for plugins in orgre lib directory 2011-01-13 21:18:20 +01:00
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.
 2011-01-09 10:22:21 +01:00
Nicolay Korslund
f55362cbdc Some Windows-help to cmake/FindAudiere.cmake + non-important changes. 2010-09-10 10:45:16 +02:00
Nicolay Korslund
358e1ca5a5 Added custom UTF8 converter. Removed iconv dependency. 2010-08-18 18:45:44 +02:00
Armin Preiml
6a936100a7 Merge remote branch 'upstream/master' 2010-08-16 20:11:38 +02:00
Nicolay Korslund
08289158d7 Added support for WAV files with libsndfile 2010-08-16 17:14:37 +02:00
Nicolay Korslund
912c8b1f2d Added mpg123 file reader 2010-08-13 22:30:22 +02:00
Nicolay Korslund
cad9712411 Implemented FFMpeg sound loading. Selecting sound library is controlled through the CMake file. 2010-08-13 17:11:03 +02:00
Nicolay Korslund
34572f0b19 Compiled and linked in sound system (not yet functional) 2010-08-12 16:13:54 +02:00
Armin Preiml
305563e595 disabled char encoding method for windows, although you'll need to add the iconv libs 2010-08-08 10:07:02 +02:00
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.
 2010-07-31 18:55:52 +02:00
Nicolay Korslund
fdb41f0774 Merged in CMake and header cleanups from zinnschlag 2010-06-06 18:01:29 +02:00
Marc Zinnschlag
c4a6fa56ea cmake modifications for out of source build 2010-06-06 12:56:46 +02:00
Nicolay Korslund
4c1d07adb6 Added missing CMake files. 2010-06-06 12:52:21 +02:00
Ardekantur
0de198980c initial commit of mac build 2010-06-03 18:56:14 -04:00
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
 2010-03-04 11:24:28 +01:00