Commit Graph

696 Commits (7d6fa1b65a828f700170fbaa4f25af090f4cd3bc)

Author SHA1 Message Date
scrawl 7d6fa1b65a CMakeLists.txt: Don't use DATADIR before it's defined 9 years ago
Dmitry Marakasov 84305a1297 Reuse DATADIR in data paths 9 years ago
scrawl dca1674133 Merge remote-tracking branch 'upstream/openmw-37' into HEAD 9 years ago
Nikolay Kasyanov 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
Marc Zinnschlag 020b3add94 Merge branch 'openmw-37' 9 years ago
scrawl 0220e82259 Remove unused SOUND_INPUT_INCLUDES cmake variable. 9 years ago
Nikolay Kasyanov 63c47a78d6 OS X: fixup Qt plugin during packaging 9 years ago
Nikolay Kasyanov d5aeb35449 OS X: use link path for packaging to allow CMake infer library search dirs for @rpath resolving 9 years ago
Nikolay Kasyanov fff6b5fde1 OS X: remove custom bundle utilities, ones from CMake versions >= 3.1.0 are good enough 9 years ago
Nikolay Kasyanov 5c4899580f OS X: use less ambiguous variable names in packaging code 9 years ago
Nikolay Kasyanov 3ba546628d OS X: always copy Cocoa platform plugin into OpenMW bundle 9 years ago
Bret Curtis 3ea3d07d44 really purge libav 9 years ago
Marc Zinnschlag cdf17f415e updated version number 9 years ago
Nikolay Kasyanov 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
Marc Zinnschlag 7f398f8790 Merge remote-tracking branch 'corristo/osx-packaging-nextgen' 10 years ago
Nikolay Kasyanov 34d601360f OS X: setup OSG plugins packaging 10 years ago
Nikolay Kasyanov 2ded28f6aa OS X: reintroduce packaging code
It's much simpler now thanks to bundle utilities with @rpath support.
10 years ago
Alexander "Ace" Olofsson 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
Alexandre Moine 581ea26605 Add appdata file for openmw and install it 10 years ago
Arthur Moore 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
Marc Zinnschlag 4fa2cd288d Merge branch 'openmw-36'
Conflicts:
	apps/openmw/mwworld/store.hpp
10 years ago
Marc Zinnschlag b3ad983f1f Merge remote-tracking branch 'scrawl/version'
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
10 years ago
scrawl 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
slothlife 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
scrawl cd2e6d4436 Move the __STDC_CONSTANT_MACROS define to cmakelists 10 years ago
scrawl 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
scrawl 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
scrawl 45fcea929a Refactor cmake scripts, reducing the amount of find_package(FFmpeg) 10 years ago
scrawl cf95d3fc35 Refactor cmake scripts, reducing the amount of find_package(Boost) 10 years ago
scrawl fc5176dc38 Refactor cmake scripts, reducing the amount of find_package(Qt4) 10 years ago
Alexander "Ace" Olofsson 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
scrawl d9a00288f8 Make install fix 10 years ago
scrawl 58917bcca6 Minor cleanup 10 years ago
scrawl 4bb3cbf0fb Remove last remains of Ogre 10 years ago
scrawl 974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
10 years ago
scrawl cdd0623009 Terrain rendering 10 years ago
scrawl b0b55e2037 Delete niftest as it's currently broken 10 years ago
Marc Zinnschlag d05d7f51d9 increased version number 10 years ago
scrawl 62ce2cc123 Minor cleanup 10 years ago
Marc Zinnschlag d7cd4203ad Merge remote-tracking branch 'k1ll/mingw' 10 years ago
scrawl 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
scrawl f2809ab63b Delete nifosgtest again 10 years ago
Rohit Nirmal 396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 10 years ago
scrawl 9ea416b852 Readded HW cursor manager (no image rotation yet) 10 years ago
scrawl fe15f31f3e Remove strings.h wrapper 10 years ago
scrawl c843cfc8e2 Physics stub in preparation for rewrite 10 years ago
Marc Zinnschlag 9f6bc1b3a9 increased version number 10 years ago
scrawl c1edc30ad7 Dead code removal 10 years ago
scrawl 157d8bfedd Remove unused mygui files 10 years ago
k1ll fe03727ae5 Don't force linking static boost libraries when building with mingw 10 years ago