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
