Commit Graph

691 Commits (openmw-37)

Author SHA1 Message Date
scrawl 94002b0758 Add freedesktop.org mimeinfo for OpenMW save game files
This allows us to launch OpenMW when the user opens a save game file through the file manager.
10 years ago
Arthur Moore c1315ed90c Build the nif file tester by default
It's extremely useful in determining if a nif file is bad without having to load up openmw or opencs.
Also updated the nif testing script to run at a low priority.
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
Marc Zinnschlag d67ad9037e increased version number 10 years ago
scrawl a8a2b44b0f Don't require libunshield on windows 10 years ago
scrawl d4a9cf7075 Fix wizard install location 10 years ago
scrawl 4fa303d7c4 Merge branch 'master' into HEAD
Conflicts:
	CMakeLists.txt
	apps/launcher/CMakeLists.txt
10 years ago
Marc Zinnschlag 45d41e22e2 Merge branch 'openmw-33' 10 years ago
Marc Zinnschlag 5909fa4368 new version number and updated changelog 10 years ago
scrawl eb1c24ffe6 Refactor video player engine to get rid of MWSound dependencies
- Split video player to separate source files.
 - Move video player engine sources to extern/ (repository will be set up on github soon).
 - Audio is handled in a MovieAudioFactory, implemented by the user (here in MWSound subsystem).
 - Handle conversion of unsupported channel layouts via ffmpeg's swresample.
10 years ago
Marc Zinnschlag a3c894c1e2 Merge branch 'cellmarker' 10 years ago
Marc Zinnschlag 86f5073293 increased version number 10 years ago
cc9cii 313aed078e Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
Conflicts:
	apps/opencs/CMakeLists.txt
10 years ago
vocollapse 772c66eedf Changed Doxygen file extensions to .cmake for consistency. Also changed output directories for doxygen. 10 years ago
cc9cii f459adf117 Revert CMake changes (didn't work for osx anyway) 10 years ago
cc9cii 971b0de4fa An attempt to make osx to find the ogre overlay headers. 10 years ago
cc9cii 758ce0ed98 Various fixes as per feedback comments. 10 years ago
vocollapse 71f3f71f78 added make target for doxygen: make doc, make doc_pages 10 years ago
cc9cii 972c789060 Add Ogre Overlay path to cmake. 10 years ago
scrawl 62ea913e69 Fix cmake warning 10 years ago
Marc Zinnschlag 147bffa7dd Merge remote-tracking branch 'slothlife/msvc-warning-fix'
Conflicts:
	CMakeLists.txt
10 years ago
slothlife 35ced14e45 Fix for MSVC warnings 10 years ago
eroen 0738e862cb Make GLOBAL_CONFIG_PATH, GLOBAL_DATA_PATH configurable 10 years ago
Marc Zinnschlag 5c8ef842b6 Merge branch 'edit' 10 years ago
scrawl b1e74e2a85 Remove support for Ogre 1.8 versions 10 years ago
Sebastian Wick f46da271d7 SYSCONFDIR should be "/etc" instead of "$PREFIX/etc" if prefix is "/usr" 10 years ago
Sebastian Wick 2ae8158ee9 SYSCONFDIR and LinuxPath should work with different install prefixs 10 years ago
Stanislav 313bdf4e78 fix 10 years ago
Stanislav 76f2e5d5b8 CMake: Added multithreading, /DWIN32_LEAN_AND_MEAN and /bigobj compile flags to VS build. 10 years ago
Marc Zinnschlag 3f671c86a8 Merge remote-tracking branch 'cc9cii/ffmpeg-swresample' 10 years ago
cc9cii d92400e550 Remove libavresample restriction. 10 years ago
cc9cii 166ee6b483 Do not use cached FFMPEG_LIBRARIES. Make error messages clearer. 10 years ago
Marc Zinnschlag 9b7f61b4ba Merge remote-tracking branch 'scrawl/myguiplugin' 10 years ago
scrawl 9d05718515 Move plugin to new plugins/ top level directory 10 years ago
Marc Zinnschlag f142d82b3a Merge remote-tracking branch 'ace/win-package-fix' 10 years ago
Marc Zinnschlag 2397a87330 Merge remote-tracking branch 'scrawl/bsatool' 10 years ago
Alexander "Ace" Olofsson dd3d7ba474 Update NSIS to use the new icon path 10 years ago
scrawl ecfc2ff5d0 Add a MyGUI plugin to register OpenMW resources, to use with MyGUI's standalone tools 10 years ago
scrawl 1bb9359b4c Fix a typo 10 years ago
scrawl fca8dc9674 Enable bsatool build by default 10 years ago
cc9cii 862c5fc8f6 Add libavresample support. Tested on windows x64 only. 10 years ago
cc9cii 785d2c7cc9 Remove incomplete implementation to support planar formats. Make libswresample a prerequisite. 10 years ago
cc9cii c6cad5adc5 Make cmake more reliably detect libswresample 10 years ago
cc9cii f4dd281393 Simplify the use of swr_convert and add #ifdef guards around code that require libswresample. 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
Marc Zinnschlag b6a3541573 increased version number 10 years ago
scrawl 17dc01ec44 Require MyGUI version 3.2.1 and remove legacy code (Fixes #1528) 10 years ago
Arthur Moore 53ce94d0e4 Disable building nif file tester by default 11 years ago
Arthur Moore cdfa24e15d (Re) Wrote a tool to test NIF files in BSAs and on the filesystem.
Just give it a set of files, one file per argument, and it will make sure openmw can read them.

On linux/mac you can use "xargs --arg-file=nifs.txt ./niftest" to give it a list of files to check.
11 years ago
scrawl 77a4e38c49 Remove -Wno-ignored-qualifiers and fix caused warnings 11 years ago
Marc Zinnschlag f4ddf2a7b9 Merge remote-tracking branch 'sandstranger/android' 11 years ago
root 713787d92f fix v7 11 years ago
root 3cd98e5259 fix code v5 10 years ago
root d8772156a7 fixe all code v 2 11 years ago
root 8a8b91dfe1 fixed all code for building on all platforms inlcudng ANDROID 10 years ago
root 16aafc26bc fixed cmake for build on all plaforms include android 11 years ago
scrawl a18cec7c8e Use a MyGUI widget to render the screen fader (Fixes #1741, Fixes #1719) 11 years ago
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
pvdk 5af12d193a Cleaned up old wizard stuff from launcher 11 years ago
pvdk 38d825b004 Merge remote-tracking branch 'upstream/master' into wizard
Conflicts:
	CMakeLists.txt
	apps/launcher/maindialog.cpp
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
pvdk ef38fae09d Merge remote-tracking branch 'upstream/master' into wizard 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
pvdk 8fe837ae6e Merge remote-tracking branch 'upstream/master' into wizard 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 c54217d008 Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	CMakeLists.txt
	components/CMakeLists.txt
	components/config/gamesettings.cpp
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
pvdk 43bc223e68 Added version info retrieval from git tags 11 years ago
scrawl 37a59a37c6 Remove cpack (no longer used, according to BrotherBrick) 11 years ago
scrawl 659d790048 uuid is not used 11 years ago
scrawl d4aeb177f9 Remove unused btKinematicCharacterController 11 years ago
Marc Zinnschlag 7c8f735004 Merge remote-tracking branch 'corristo/osx-fixes' into openmw-28 11 years ago
Dmitriy 'Endorph' Shkurskiy 116f125f05 Windows-specific definition to deny SDL from providing it's own WinMain() 11 years ago
Marc Zinnschlag 0d3e67dafc Merge branch 'master' into openmw-28 11 years ago
scrawl 5b0a4c9424 Get rid of unused file and some other cruft. 11 years ago
Marc Zinnschlag fe34c9cf1f increased version number 11 years ago
Scott Howard 2f082ef796 remove unneeded libraries 11 years ago
Nikolay Kasyanov 892ff93489 OS X: attempt to fix #1045 11 years ago
Nikolay Kasyanov 73c6aba4d0 OS X: Ogre plugins are now installed in OpenCS bundle too. Generalized
plugin install routine.
11 years ago
Nikolay Kasyanov 874ecee079 OS X: do not enforce static boost, this can be set externally
anyway
11 years ago
Nikolay Kasyanov 89c60b065c OS X: looks like OGRE_Plugin_CgProgramManager_FOUND is not reliable 11 years ago
Nikolay Kasyanov 87853f4066 OS X: consider Ogre CG plugin as used only if it’s found 11 years ago
Nikolay Kasyanov 99cfb8cda2 OS X: this CMake parameters can be set in CMake invocation, no need to hardcode them in CMakeLists.txt 11 years ago
pvdk d8f20d2e66 Added the infrastructure to start working on the installation wizard 11 years ago
Marc Zinnschlag 04b1657d98 Merge branch 'openmw-27'
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
11 years ago
eroen d4b8ac5b49 don't dpkg on windows and macos
No need to clutter windows and macos configuration with dpkg options, as it is
unlikely to ever be useful.
11 years ago
eroen 67284e2f9d Introduce -DBUILD_WITH_DPKG to toggle dpkg based install
The current system automagically chooses between the dpkg-based install method
(for debian-derived distributions) and a "traditional" install and sets
install paths based on whether cmake can find a 'dpkg' executable.

This is not ideal, since dpkg is occasionally installed on linux distributions
unrelated to debian for purposes other than package management. In particular,
Arch and Gentoo carry it in their repositories.
11 years ago
Nikolay Kasyanov fa13818360 OS X: OpenCS packaging 11 years ago
Marc Zinnschlag ef401a774b Merge remote-tracking branch 'eroen/install-fix' 11 years ago
Marc Zinnschlag 224aa5d38c Merge remote-tracking branch 'eroen/install-fix-17' into openmw-27 11 years ago
Bret Curtis 5a071b0f81 necessary dpkg rules to get opencs building and packaged on dpkg systems 11 years ago
eroen e885c502a1 Stop installing "Daedric Font License.txt"
It was removed in 3a827d9c12
11 years ago
eroen 6b931f566d Stop installing "Daedric Font License.txt"
It was removed in 3a827d9c12
11 years ago
Bret Curtis 36efe9605f necessary dpkg rules to get opencs building and packaged on dpkg systems 11 years ago
Marc Zinnschlag 418ccf705d Merge branch 'openmw-27'
Conflicts:
	apps/launcher/graphicspage.hpp
	components/CMakeLists.txt
11 years ago
Marc Zinnschlag f4e6f31658 Merge remote-tracking branch 'scrawl/openmw-27' 11 years ago
Marc Zinnschlag dec1483fa4 Merge branch 'saving' into openmw-27 11 years ago
scrawl 636d399c7f Refactored Ogre initialisation into a component 11 years ago
Marc Zinnschlag b20943b123 Merge remote-tracking branch 'ace/win-package' into openmw-27 11 years ago
Alexander "Ace" Olofsson 632a53ead4 Support packing the OpenCS into windows builds 11 years ago
Marc Zinnschlag 29fce6d11f increased version number 11 years ago
Marek Kochanowicz b138533bf3 renamed defaultfilter.omwaddon.project to defaultfilters. 11 years ago
Marek Kochanowicz 96b6787255 Getting rid of extension. Correcting tiny mistake in filters file. 11 years ago
Marek Kochanowicz 6b293961b4 This appears to work. 11 years ago