93ee8f1991
Allow for earlier CMake on Qt4
9 years ago
fe241be26c
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
9 years ago
1dbc1e67d8
Possible Qt5 link fix for AppVeyor
9 years ago
9c7bbd667b
Merge branch 'usersettings'
9 years ago
d6bd2cb1f0
changed name of openmw-cs user settings file
9 years ago
46f45773ca
CMake: Add the list of possible values for some config options
...
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
9 years ago
7db307e028
delete unused variables
9 years ago
7d374b36fd
change cmake variables
9 years ago
d9b1b7c516
addd forgotten line
9 years ago
238a5824be
add custom new variable fot Qt
9 years ago
bd5057aa3c
enable opengl es1
9 years ago
77965501d4
CMakeLists.txt: set the OPENMW_RESOURCE_FILES before configuring openmw.cfg
9 years ago
7d6fa1b65a
CMakeLists.txt: Don't use DATADIR before it's defined
9 years ago
84305a1297
Reuse DATADIR in data paths
9 years ago
dca1674133
Merge remote-tracking branch 'upstream/openmw-37' into HEAD
9 years ago
2108e96c15
OS X: use TGA, PNG & JPEG plugins instead of ImageIO
...
Using ImageIO is troublesome when one needs to read an image from memory,
see for the details: https://forum.openmw.org/viewtopic.php?f=20&t=2949&start=220#p35531
9 years ago
020b3add94
Merge branch 'openmw-37'
9 years ago
0220e82259
Remove unused SOUND_INPUT_INCLUDES cmake variable.
9 years ago
63c47a78d6
OS X: fixup Qt plugin during packaging
9 years ago
d5aeb35449
OS X: use link path for packaging to allow CMake infer library search dirs for @rpath resolving
9 years ago
fff6b5fde1
OS X: remove custom bundle utilities, ones from CMake versions >= 3.1.0 are good enough
9 years ago
5c4899580f
OS X: use less ambiguous variable names in packaging code
9 years ago
3ba546628d
OS X: always copy Cocoa platform plugin into OpenMW bundle
9 years ago
3ea3d07d44
really purge libav
9 years ago
cdf17f415e
updated version number
9 years ago
dbcce482a6
OS X: enable high resolution mode for OpenMW & OpenCS
...
We don't support retina completely yet, but it's still better than
blurry mess, and Qt does pretty good job for OpenCS already.
10 years ago
7f398f8790
Merge remote-tracking branch 'corristo/osx-packaging-nextgen'
10 years ago
34d601360f
OS X: setup OSG plugins packaging
10 years ago
2ded28f6aa
OS X: reintroduce packaging code
...
It's much simpler now thanks to bundle utilities with @rpath support.
10 years ago
46ce04a65b
Don't package duplicate version for Windows
...
The real version file is in the resources folder, and that's where it's read from. So the extra file is unused, and redundant.
10 years ago
581ea26605
Add appdata file for openmw and install it
10 years ago
2a653e45fd
(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.
10 years ago
4fa2cd288d
Merge branch 'openmw-36'
...
Conflicts:
apps/openmw/mwworld/store.hpp
10 years ago
b3ad983f1f
Merge remote-tracking branch 'scrawl/version'
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
10 years ago
f09e4620b6
Move OpenMW version information to a textfile instead of compiling it in
...
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
10 years ago
83ef1f7eea
Add support for linking OpenSceneGraph statically
...
Added some basic support for linking to OpenSceneGraph and its plugins
statically. Also added a library necessary to statically link MyGUI
(previously Ogre pulled it in).
10 years ago
cd2e6d4436
Move the __STDC_CONSTANT_MACROS define to cmakelists
10 years ago
f70250a296
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/opencs/CMakeLists.txt
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/CMakeLists.txt
components/CMakeLists.txt
extern/osg-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
e13a938896
Add support to build with Qt5 (Task #2665 )
...
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
10 years ago
45fcea929a
Refactor cmake scripts, reducing the amount of find_package(FFmpeg)
10 years ago
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
10 years ago
fc5176dc38
Refactor cmake scripts, reducing the amount of find_package(Qt4)
10 years ago
cd42448cd6
Windows build fixes and CMakeLists cleanup
...
Adds some flags necessary to build and link with OSG.
This also moves LTO and MP switches to user-accessible options, and actually
applies the generated CXXFLAGS to the project. Since the generation
happens after the subdirectories are added.
10 years ago
d9a00288f8
Make install fix
10 years ago
58917bcca6
Minor cleanup
10 years ago
4bb3cbf0fb
Remove last remains of Ogre
10 years ago
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
10 years ago
cdd0623009
Terrain rendering
10 years ago
b0b55e2037
Delete niftest as it's currently broken
10 years ago
d05d7f51d9
increased version number
10 years ago
62ce2cc123
Minor cleanup
10 years ago
d7cd4203ad
Merge remote-tracking branch 'k1ll/mingw'
10 years ago
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
10 years ago
f2809ab63b
Delete nifosgtest again
10 years ago
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
10 years ago
9ea416b852
Readded HW cursor manager (no image rotation yet)
10 years ago
fe15f31f3e
Remove strings.h wrapper
10 years ago
c843cfc8e2
Physics stub in preparation for rewrite
10 years ago
9f6bc1b3a9
increased version number
10 years ago
c1edc30ad7
Dead code removal
10 years ago
157d8bfedd
Remove unused mygui files
10 years ago
fe03727ae5
Don't force linking static boost libraries when building with mingw
10 years ago
48a6d7c1a0
Remove mygui platform libraries from cmake
10 years ago
8410966753
Disable mygui plugin for now
10 years ago
92ef9b1c57
Rename to osg-ffmpeg-videoplayer
10 years ago
42f6d9e15b
Port video player
10 years ago
1699759d12
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/view/render/cell.cpp
10 years ago
e6cf959134
Revert "Delete nifosgtest"
...
This reverts commit ba3075dc11
10 years ago
ba3075dc11
Delete nifosgtest
10 years ago
d646836cdd
turn on -Wno-potentially-evaluated-expression on clang
10 years ago
af67de73a5
Delete shiny
10 years ago
4e69e7cc0f
OpenMW compiles and runs w/o render window
10 years ago
12f27123f2
Billboard scaling fix and culling bug fix
10 years ago
236d628884
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/documentmanager.cpp
components/CMakeLists.txt
components/bsa/resources.cpp
components/nif/data.hpp
components/nif/node.cpp
components/nifogre/mesh.hpp
components/nifogre/ogrenifloader.cpp
components/nifogre/particles.cpp
10 years ago
34d503017a
OpenCS: Set up an osgQt GraphicsWindow in SceneWidget
10 years ago
f0a7b202b9
Merge branch 'openmw-35-1'
10 years ago
d7baf92353
tell include_directories which libraries are system libs
10 years ago
88f746574d
fix compiler detection and adding build flags in CMakeLists.txt
10 years ago
907ac5ef7f
Merge remote-tracking branch 'scrawl/master'
10 years ago
0fda1cdd53
Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs
10 years ago
cdf53c17e7
updated version number
10 years ago
1eaa64c49c
CMake: remove lines for MinGW, no one is maintaining those
10 years ago
c6aa374934
CMake: set windows warning levels globally instead of per target
10 years ago
c57f9ad5dc
CMake: don't use CMAKE_CXX_FLAGS for gcc warning levels, it only works for CMAKE_BUILD_TYPE=None
10 years ago
2b7287cbd2
Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
...
Conflicts:
CMakeLists.txt
10 years ago
97cc2522c0
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwgui/settingswindow.cpp
extern/oics/ICSInputControlSystem_joystick.cpp
files/mygui/openmw_settings_window.layout
10 years ago
a192836582
(hopefully) correct gamecontrollerdb.txt behavior
10 years ago
1e4a845b6f
Minor code cleanup
10 years ago
8d64f2081e
Add particle system state loading
10 years ago
8e01d8cb19
Add OSG nifloader, currently supports geometry, materials, basic texturing, skinning, morphing, and most controllers.
10 years ago
8c10d4badb
NIF reader compiles without Ogre
10 years ago
d4dff6ed55
Port BSAFile to istream, remove OGRE bsa resource system
10 years ago
1124343e0d
Add BUILD_OPENMW switch, build will be broken in next commit
10 years ago
a9b74671a6
Fix various MSVC warnings
10 years ago
6cc9fa2b3f
Merge remote-tracking branch 'slothlife/cmake-release-build-fix'
10 years ago
f1fd27aeaf
Select CMAKE_BUILD_TYPE if not specified
...
A suggestion by kcat to ensure CMake selects a reasonable default for
the build type if users don't set it themselves.
10 years ago
2b619296d7
Merge remote-tracking branch 'scrawl/master'
10 years ago
003d0610f4
Merge remote-tracking branch 'ace/link-time-optimzation'
10 years ago
9da0a9f8c4
Enable link-time optimization on MSVC
10 years ago
399c24c646
CMake cleanup: remove redundant setting of Permissions to default values
10 years ago
e81d2a9dde
Merge remote-tracking branch 'upstream/openmw-35' into HEAD
...
Conflicts:
apps/openmw/mwmechanics/npcstats.cpp
10 years ago
c63ab673e1
Revert "Add freedesktop.org mimeinfo for OpenMW save game files"
...
This reverts commit 94002b0758
10 years ago
28eb766bba
Respect LIB_SUFFIX
10 years ago
5534306eb3
Few rename fixes
10 years ago
abb334bc1e
Missing change for the tool rename
10 years ago
c02537c3b1
incremented version number
10 years ago
0557d45bd1
renamed opencs into openmw-cs
10 years ago
e0d0997409
Rename omwlauncher -> openmw-launcher, mwiniimport -> openmw-iniimporter
10 years ago
8e5c8aa562
Add support for passing in Ogre plugin directory via CMake
10 years ago
f4bf2aa412
Merge remote-tracking branch 'origin/master'
10 years ago
ebe2e1491a
Fix broken windows builds due to README change
10 years ago
031eec4550
Starting ESS importer for Morrowind save files
10 years ago
595c08817f
Merge remote-tracking branch 'scrawl/master'
10 years ago
e439065897
Merge remote-tracking branch 'scrawl/master'
10 years ago
eecea4131f
Reduce MyGUI includes
10 years ago
9d07edda13
UnitTests: remove GMock which wasn't used anyway, and the gmock headers fail to compile together with gtest on ubuntu 14.04
10 years ago
f8a3ec3ee3
Merge remote-tracking branch 'scrawl/cmdline-savegame'
10 years ago
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
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
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
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
d67ad9037e
increased version number
10 years ago
a8a2b44b0f
Don't require libunshield on windows
10 years ago
d4a9cf7075
Fix wizard install location
10 years ago
4fa303d7c4
Merge branch 'master' into HEAD
...
Conflicts:
CMakeLists.txt
apps/launcher/CMakeLists.txt
10 years ago
45d41e22e2
Merge branch 'openmw-33'
10 years ago
5909fa4368
new version number and updated changelog
10 years ago
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
a3c894c1e2
Merge branch 'cellmarker'
10 years ago
86f5073293
increased version number
10 years ago
313aed078e
Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
...
Conflicts:
apps/opencs/CMakeLists.txt
10 years ago
772c66eedf
Changed Doxygen file extensions to .cmake for consistency. Also changed output directories for doxygen.
10 years ago
f459adf117
Revert CMake changes (didn't work for osx anyway)
10 years ago
971b0de4fa
An attempt to make osx to find the ogre overlay headers.
10 years ago
758ce0ed98
Various fixes as per feedback comments.
10 years ago
71f3f71f78
added make target for doxygen: make doc, make doc_pages
10 years ago
972c789060
Add Ogre Overlay path to cmake.
10 years ago
62ea913e69
Fix cmake warning
10 years ago
147bffa7dd
Merge remote-tracking branch 'slothlife/msvc-warning-fix'
...
Conflicts:
CMakeLists.txt
10 years ago
35ced14e45
Fix for MSVC warnings
10 years ago
0738e862cb
Make GLOBAL_CONFIG_PATH, GLOBAL_DATA_PATH configurable
10 years ago
5c8ef842b6
Merge branch 'edit'
10 years ago
b1e74e2a85
Remove support for Ogre 1.8 versions
10 years ago
f46da271d7
SYSCONFDIR should be "/etc" instead of "$PREFIX/etc" if prefix is "/usr"
10 years ago
2ae8158ee9
SYSCONFDIR and LinuxPath should work with different install prefixs
10 years ago
313bdf4e78
fix
10 years ago
76f2e5d5b8
CMake: Added multithreading, /DWIN32_LEAN_AND_MEAN and /bigobj compile flags to VS build.
10 years ago
3f671c86a8
Merge remote-tracking branch 'cc9cii/ffmpeg-swresample'
10 years ago
d92400e550
Remove libavresample restriction.
10 years ago
166ee6b483
Do not use cached FFMPEG_LIBRARIES. Make error messages clearer.
10 years ago
9b7f61b4ba
Merge remote-tracking branch 'scrawl/myguiplugin'
10 years ago
9d05718515
Move plugin to new plugins/ top level directory
10 years ago
f142d82b3a
Merge remote-tracking branch 'ace/win-package-fix'
10 years ago
2397a87330
Merge remote-tracking branch 'scrawl/bsatool'
10 years ago
dd3d7ba474
Update NSIS to use the new icon path
10 years ago
ecfc2ff5d0
Add a MyGUI plugin to register OpenMW resources, to use with MyGUI's standalone tools
10 years ago
1bb9359b4c
Fix a typo
10 years ago
fca8dc9674
Enable bsatool build by default
10 years ago
862c5fc8f6
Add libavresample support. Tested on windows x64 only.
10 years ago
785d2c7cc9
Remove incomplete implementation to support planar formats. Make libswresample a prerequisite.
10 years ago
c6cad5adc5
Make cmake more reliably detect libswresample
10 years ago
f4dd281393
Simplify the use of swr_convert and add #ifdef guards around code that require libswresample.
10 years ago
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
b6a3541573
increased version number
10 years ago
17dc01ec44
Require MyGUI version 3.2.1 and remove legacy code ( Fixes #1528 )
10 years ago
53ce94d0e4
Disable building nif file tester by default
11 years ago
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
77a4e38c49
Remove -Wno-ignored-qualifiers and fix caused warnings
11 years ago
f4ddf2a7b9
Merge remote-tracking branch 'sandstranger/android'
11 years ago
713787d92f
fix v7
11 years ago
3cd98e5259
fix code v5
10 years ago
d8772156a7
fixe all code v 2
11 years ago
8a8b91dfe1
fixed all code for building on all platforms inlcudng ANDROID
10 years ago
16aafc26bc
fixed cmake for build on all plaforms include android
11 years ago
a18cec7c8e
Use a MyGUI widget to render the screen fader ( Fixes #1741 , Fixes #1719 )
11 years ago
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
192d5ca08f
Allow overriding OGRE_PLUGIN_DIR in cmake command line
11 years ago
7316f4dde4
increased version number
11 years ago
96ba4a414f
Fix MSVC size_t conversion warning.
11 years ago
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
5960d3f1d9
These files moved, leading to package failure
11 years ago
7eee0855f7
Merge commit 'pull/origin/155'
...
Conflicts:
CMakeLists.txt
11 years ago
10758d6297
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
11 years ago
3bf599248e
CMake cleanup: Remove distribution-specific install stuff (unused)
11 years ago
e28888df39
fix for dejavu location
11 years ago
8419002393
Task #940 : Move licenses to appropriate place in docs. Additional cleanup.
11 years ago
5313862a46
Merge remote-tracking branch 'scrawl/master'
11 years ago
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
5df9ff8e2c
Respect CMAKE_INSTALL_PREFIX in the global openmw.cfg
...
Fixes installing to /usr/local (Bug #1378 )
11 years ago
5af12d193a
Cleaned up old wizard stuff from launcher
11 years ago
38d825b004
Merge remote-tracking branch 'upstream/master' into wizard
...
Conflicts:
CMakeLists.txt
apps/launcher/maindialog.cpp
11 years ago
244eb11651
Merge remote-tracking branch 'greye/widechar'
11 years ago
8f9091550e
require boost::locale only on Windows
11 years ago
2f6d400c62
Merge branch 'master' of https://github.com/OpenMW/openmw into newgame
11 years ago
b728a919a2
write dependency on boost::locale to CMake files
11 years ago
46c32f6c47
OpenEngine MyGUI logging facility
11 years ago
510b7f8505
Task #1333 : Remove cmake git tag reading
11 years ago
7c149e98e0
Merge branch 'openmw-30'
11 years ago
a5f0fe7282
incremented version number
11 years ago
d08869a25d
Merge remote-tracking branch 'slothlife/msvc_warning_cleanup'
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
11 years ago
Alexander "Ace" Olofsson
Marc Zinnschlag
Paul Cercueil
sandstranger
scrawl
Dmitry Marakasov
Nikolay Kasyanov
Bret Curtis
Alexandre Moine
Arthur Moore
slothlife
Rohit Nirmal
k1ll
Scott Howard
Digmaster
Rosanne DiMesio
Marco Schulze
cc9cii
vocollapse
eroen
Sebastian Wick
Stanislav
root
bogglez
pvdk
greye