bogglez
b56cb7e5ee
Remove defunct option for building without FFmpeg
...
- Added REQUIRED to find_package(FFmpeg)
- Removed USE_FFMPEG option from CMakeLists.txt
- Always use FFmpeg for sound input
- Removed SOUND_DEFINE from CMakeLists.txt
- Removed #else branch from videoplayer.cpp with dummy VideoState code
(FFmpeg is now guaranteed to exist and the code was incomplete)
- Remove #ifdef OPENMW_USE_FFMPEG in ffmpeg_decoder.cpp, it is guaranteed to be used
- Remove #ifdef OPENMW_USE_FFMPEG from soundmanagerimp.cpp, it is guaranteed to be used
11 years ago
scrawl
192d5ca08f
Allow overriding OGRE_PLUGIN_DIR in cmake command line
11 years ago
Marc Zinnschlag
7316f4dde4
increased version number
11 years ago
slothlife
96ba4a414f
Fix MSVC size_t conversion warning.
11 years ago
slothlife
9ea22324f7
Fix some MSVC warnings.
...
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
11 years ago
Alexander "Ace" Olofsson
5960d3f1d9
These files moved, leading to package failure
11 years ago
scrawl
7eee0855f7
Merge commit 'pull/origin/155'
...
Conflicts:
CMakeLists.txt
11 years ago
scrawl
10758d6297
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
11 years ago
scrawl
3bf599248e
CMake cleanup: Remove distribution-specific install stuff (unused)
11 years ago
Bret Curtis
e28888df39
fix for dejavu location
11 years ago
Bret Curtis
8419002393
Task #940 : Move licenses to appropriate place in docs. Additional cleanup.
11 years ago
Marc Zinnschlag
5313862a46
Merge remote-tracking branch 'scrawl/master'
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
scrawl
5df9ff8e2c
Respect CMAKE_INSTALL_PREFIX in the global openmw.cfg
...
Fixes installing to /usr/local (Bug #1378 )
11 years ago
Marc Zinnschlag
244eb11651
Merge remote-tracking branch 'greye/widechar'
11 years ago
greye
8f9091550e
require boost::locale only on Windows
11 years ago
scrawl
2f6d400c62
Merge branch 'master' of https://github.com/OpenMW/openmw into newgame
11 years ago
greye
b728a919a2
write dependency on boost::locale to CMake files
11 years ago
greye
46c32f6c47
OpenEngine MyGUI logging facility
11 years ago
scrawl
510b7f8505
Task #1333 : Remove cmake git tag reading
11 years ago
Marc Zinnschlag
7c149e98e0
Merge branch 'openmw-30'
11 years ago
Marc Zinnschlag
a5f0fe7282
incremented version number
11 years ago
Marc Zinnschlag
d08869a25d
Merge remote-tracking branch 'slothlife/msvc_warning_cleanup'
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
11 years ago
slothlife
f33559fead
Fixes for MSVC warnings, less overall changes
...
Kept some fixes from the first round of review. Found out that several
targets weren't being built with the same basic warnings disabled.
Disabled a few warnings for external libraries specifically, rather than
applying them to all targets.
11 years ago
slothlife
c160a04ede
Revert "Fixes for warnings when building with MSVC"
...
This reverts commit 46eb20b98c
.
11 years ago
Marc Zinnschlag
199f030d38
adjusted cmake file for opencs user settings file rename
11 years ago
slothlife
46eb20b98c
Fixes for warnings when building with MSVC
...
Most warnings are innocuous (wrong type-specifier for forward
declarations, conversion of literals into unsigned integers, warnings
about methods optimized out), but I believe actual bugs were revealed in
vartypedelegate.cpp and combat.cpp.
11 years ago
Marc Zinnschlag
21142711f0
Merge remote-tracking branch 'graffy76/master'
11 years ago
graffy76
a17cb1f389
Fixed opencs.ini formatting
11 years ago
graffy76
475214ab62
Implmented QSettings for loading / saving file definitions. Also
...
renamed opencs.cfg to opencs.ini to follow Ini format standards
11 years ago
Thoronador
688d556510
remove references to Audiere and MPG123 from top-level CMake file
11 years ago
Sandy
36914b43d7
Remove install of License of no longer used font
11 years ago
scrawl
78d322e6a5
Revert "Temporary added broken CMakeLists.txt - Travis IRC notification test."
...
This reverts commit 529d2436b5
.
11 years ago
Lukasz Gromanowski
529d2436b5
Temporary added broken CMakeLists.txt - Travis IRC notification test.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
scrawl
0a17245633
Refactored settings window
11 years ago
Alexander "Ace" Olofsson
7ed3effc92
Fix windows packaging issue now that the OFL license doesn't exist
...
anymore.
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
Bret Curtis
ab224f93c9
remove our stdint.h version that uses boost and force usage of system stdint.h
11 years ago
Marc Zinnschlag
6101916b7d
bumped version number
11 years ago
pvdk
56d537e23d
Added some sanity checking: compare git version with manual version
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
Nikolay Kasyanov
4a61868521
OS X: fixed Ogre plugin packaging
11 years ago
Nikolay Kasyanov
e4017b8bfe
It seems that OctreeSceneManager is not required anymore
11 years ago
Nikolay Kasyanov
3c281c6a62
OS X: specify path to framework binary, not to framework directory
11 years ago
Nikolay Kasyanov
c2fe0d480a
Merge remote-tracking branch 'upstream/master' into osx-ogre-19
...
Conflicts:
CMakeLists.txt
11 years ago
Marc Zinnschlag
053b3dc371
Merge branch 'openmw-28'
...
Conflicts:
CMakeLists.txt
11 years ago
Nikolay Kasyanov
58add97676
Merge branch 'master' into osx-ogre-19
...
Conflicts:
CMakeLists.txt
11 years ago
scrawl
4e6507248b
Fix travis build
11 years ago
pvdk
19bef4fce8
Distinguish between release and development builds
11 years ago